allow for overriding epochs, but no base epoch

diff --git a/trunk/R/db.R b/trunk/R/db.R
index 839adac9a27f00b3d2ed0bb958ae65c6b56fa90e..2dc68926ddd90a33ee3e4e436c29da03289eea83 100644 (file)
--- a/trunk/R/db.R
+++ b/trunk/R/db.R
@@ -103,10 +103,12 @@ db_cur_version <- function(con) {
     return(as.integer(dbGetQuery(con, 'SELECT max(version) FROM database_versions')[[1]]))
 }
 
+## this is just wrong. It should never return anything greater than 0.
 db_base_epoch <- function(con) {
-    return(as.integer(dbGetQuery(con,
-        paste('SELECT max(base_epoch) FROM database_versions'
-             ,'WHERE version IN (SELECT max(version) FROM database_versions)'))[[1]]))
+  return(0)
+###     return(as.integer(dbGetQuery(con,
+###         paste('SELECT max(base_epoch) FROM database_versions'
+###              ,'WHERE version IN (SELECT max(version) FROM database_versions)'))[[1]]))
 }
 
 db_get_base_epoch <- function() {
@@ -418,7 +420,7 @@ db_latest_build_version <- function(pkgname,verbose=FALSE) {
     } else if (0 == nrow(build)) {
         return(NULL)
     }
-    return(version_new(build$r_version, build$deb_revision, build$deb_epoch))
+    return(version_new(build$r_version, pkgname=pkgname, build$deb_revision, build$deb_epoch))
 }
 
 db_latest_build_status <- function(pkgname,verbose=FALSE) {
@@ -466,6 +468,20 @@ db_blacklist_packages <- function() {
     return(packages)
 }
 
+db_epoch_override <- function(pkgname) {
+  con <- db_start()
+  epoch.override <- dbGetQuery(con,paste('SELECT epoch FROM epoch_override WHERE package = ',db_quote(pkgname)))
+  print(c("pkgname: ",pkgname))
+  print(epoch.override)
+  db_stop(con)
+  if(NROW(epoch.override)>=1) {
+    return(epoch.override$epoch[1])
+  } else {
+    return(0)
+  }
+}
+
+
 db_blacklist_reasons <- function () {
     con <- db_start()
     packages <- dbGetQuery(con,'SELECT package,explanation from blacklist_packages group by explanation')