rip bundles

[cran2deb.git] / trunk / R / version.R

diff --git a/trunk/R/version.R b/trunk/R/version.R
index 184ec2380bfa8944dc73fffcebf8d185bd361172..579523326d444e319bb0d33de14b3b59864e49eb 100644 (file)
--- a/trunk/R/version.R
+++ b/trunk/R/version.R
@@ -26,28 +26,28 @@ version_new <- function(rver,debian_revision=1, debian_epoch=db_get_base_epoch()
 
     # always add the '-1' Debian release; nothing is lost and rarely will R
     # packages be Debian packages without modification.
-    return(paste(pkgver,'-',debian_revision,sep=''))
+    return(paste(pkgver,'-',version_suffix_step,version_suffix,debian_revision,sep=''))
 }
 
 version_epoch <- function(pkgver) {
     # return the Debian epoch of a Debian package version
     if (!length(grep(':',pkgver)))
         return(0)
-    return(as.integer(sub('^([0-9]+):.*','\\1',pkgver)))
+    return(as.integer(sub('^([0-9]+):.*$','\\1',pkgver)))
 }
 # version_epoch . version_new(x,y) = id
 # version_epoch(version_new(x,y)) = base_epoch
 
 version_revision <- function(pkgver) {
     # return the Debian revision of a Debian package version
-    return(as.integer(sub('.*-([0-9]+)$','\\1',pkgver)))
+    return(as.integer(sub(paste('.*-([0-9]+',version_suffix,')?([0-9]+)$',sep=''),'\\2',pkgver)))
 }
 # version_revision . version_new(x) = id
 # version_revision(version_new(x)) = 1
 
 version_upstream <- function(pkgver) {
     # return the upstream version of a Debian package version
-    return(sub('-[0-9]+$','',sub('^[0-9]+:','',pkgver)))
+    return(sub('-[a-zA-Z0-9+.~]+$','',sub('^[0-9]+:','',pkgver)))
 }
 # version_upstream . version_new = id
 
@@ -75,11 +75,7 @@ version_update <- function(rver, prev_pkgver, prev_success) {
 
 new_build_version <- function(pkgname) {
     if (!(pkgname %in% rownames(available))) {
-        bundle <- r_bundle_of(pkgname)
-        if (is.null(bundle)) {
-            fail('tried to discover new version of',pkgname,'but it does not appear to be available')
-        }
-        name <- bundle
+        fail('tried to discover new version of',pkgname,'but it does not appear to be available')
     }
     db_ver <- db_latest_build_version(pkgname)
     db_succ <- db_latest_build_status(pkgname)[[1]]