From: blundellc Date: Tue, 24 Mar 2009 20:33:19 +0000 (+0000) Subject: switch DB date stamp format to Sys.time() X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f9487ec5bcd78eddc4046782a3942166924043b9;p=cran2deb.git switch DB date stamp format to Sys.time() git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@212 edb9625f-4e0d-4859-8d74-9fd3b1da38cb --- diff --git a/trunk/R/db.R b/trunk/R/db.R index 9e09f24..f8eb0f9 100644 --- a/trunk/R/db.R +++ b/trunk/R/db.R @@ -59,7 +59,7 @@ db_start <- function() { ,',deb_epoch INTEGER NOT NULL' ,',deb_revision INTEGER NOT NULL' ,',db_version INTEGER NOT NULL' - ,',date_stamp TEXT NOT NULL' + ,',date_stamp INTEGER NOT NULL' ,',scm_revision TEXT NOT NULL' ,',success INTEGER NOT NULL' ,',log TEXT' @@ -308,7 +308,7 @@ db_record_build <- function(package, deb_version, log, success=F) { ,',',db_quote(version_revision(deb_version)) ,',',db_cur_version(con) ,',',as.integer(success) - ,',',db_quote(format(Sys.time(),'%a, %d %b %Y %H:%M:%S %z')) + ,',',db_quote(Sys.time()) ,',',db_quote(scm_revision) ,',',db_quote(paste(log, collapse='\n')) ,')')) @@ -327,6 +327,7 @@ db_builds <- function(pkgname) { return(NULL) } build$success <- as.logical(build$success) + build$date_stamp <- as.integer(build$date_stamp) return(build) } diff --git a/trunk/R/debianpkg.R b/trunk/R/debianpkg.R index 22bb5b4..d883541 100644 --- a/trunk/R/debianpkg.R +++ b/trunk/R/debianpkg.R @@ -27,7 +27,7 @@ generate_changelog_entry <- function(build, changelog) { cat(paste(paste(build$srcname,' (',debversion,') unstable; urgency=low',sep='') ,'' ,paste(' * cran2deb ',build$scm_revision ,' with DB version ',as.integer(build$db_version),'.',sep='') - ,'',paste(' --',maintainer,'',build$date_stamp) + ,'',paste(' --',maintainer,'',format(build$date_stamp,'%a, %d %b %Y %H:%M:%S %z')) ,'','','',sep='\n'),file=changelog, append=TRUE) } diff --git a/trunk/R/getrpkg.R b/trunk/R/getrpkg.R index 5273a1f..f60329a 100644 --- a/trunk/R/getrpkg.R +++ b/trunk/R/getrpkg.R @@ -16,7 +16,7 @@ download_pkg <- function(dir, pkgname) { # record some basic information pkg <- pairlist() - pkg$date_stamp = format(Sys.time(),'%a, %d %b %Y %H:%M:%S %z') + pkg$date_stamp = Sys.time() pkg$name = pkgname pkg$repoURL = available[pkgname,'Repository'] pkg$repo = repourl_as_debian(pkg$repoURL)