X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=trunk%2FR%2Fdb.R;h=aa81b10ed3096f96a4e2a06732d1506a3f9a59f9;hb=a56ba7026a084918fea8d7000555e6f406589ff2;hp=cd9c606234a41d409df2b61a1d5b9d48ccb345ff;hpb=f31513781bbb3f61468502e67977b2b25991bb98;p=cran2deb.git diff --git a/trunk/R/db.R b/trunk/R/db.R index cd9c606..aa81b10 100644 --- a/trunk/R/db.R +++ b/trunk/R/db.R @@ -304,7 +304,7 @@ db_update_package_versions <- function() { } db_date_format <- '%Y-%m-%d' -db_time_format <- '%H:%M:%OS %Z' +db_time_format <- '%H:%M:%OS' db_record_build <- function(package, deb_version, log, success=F) { # if the log is more than 1kB, only keep the last 1kB. @@ -318,7 +318,7 @@ db_record_build <- function(package, deb_version, log, success=F) { log <- paste(log,collapse='\n') end <- nchar(log) - max_log_len <- 1024 + max_log_len <- 10240 if (end > max_log_len) { log <- db_quote(substr(log,end-max_log_len,end)) } else { @@ -341,7 +341,7 @@ db_record_build <- function(package, deb_version, log, success=F) { ,',',db_quote(scm_revision) ,',',log ,')') - print(sqlcmd) + ##print(sqlcmd) try(dbGetQuery(con,sqlcmd)) options(o) db_stop(con) @@ -442,7 +442,7 @@ db_blacklist_packages <- function() { db_blacklist_reasons <- function () { con <- db_start() - packages <- dbGetQuery(con,'SELECT package,explanation from blacklist_packages') + packages <- dbGetQuery(con,'SELECT package,explanation from blacklist_packages group by explanation') db_stop(con) return(packages) }