-build <- function(name,extra_deps,force=F) {
+build <- function(name,extra_deps,force=F,do_cleanup=T) {
# can't, and hence don't need to, build base packages
if (name %in% base_pkgs) {
return(T)
# obtain the Debian version-to-be
version <- try(new_build_version(name))
if (inherits(version,'try-error')) {
- error('failed to build',name)
+ error('failed to build in new_build_version: ',name)
return(NULL)
}
}
if (name %in% db_blacklist_packages()) {
- fail('package',name,'is blacklisted. consult database for reason.')
+ #fail('package',name,'is blacklisted. consult database for reason.')
+ notice('package',name,'is blacklisted. consult database for reason.')
+ return(NULL)
}
pkg <- prepare_new_debian(prepare_pkg(dir,name),extra_deps)
file.remove(Sys.glob(file.path(pbuilder_results,'*.upload')))
notice('R dependencies:',paste(pkg$depends$r,collapse=', '))
+ #if (debug) notice(paste("build_debian(",pkg,") invoked\n",sep=""))
build_debian(pkg)
+ #if (debug) notice(paste("build_debian(",pkg,") completed.\n",sep=""))
+
# upload the package
- ret = log_system('umask 002;dput','-c',shQuote(dput_config),'local'
- ,changesfile(pkg$srcname,pkg$debversion))
+ notice("Package upload")
+## ret = log_system('umask 002;dput','-c',shQuote(dput_config),'local' ,changesfile(pkg$srcname,pkg$debversion))
+
+ cmd = paste('umask 002; cd /var/www/cran2deb/rep && reprepro -b . include testing', changesfile(pkg$srcname,pkg$debversion),sep=" ")
+ #if (verbose) notice('Executing: ',cmd)
+ ret = log_system(cmd)
if (ret != 0) {
- fail('upload failed!')
- }
+ #fail('upload failed!')
+ notice("Upload failed, ignored.")
+ } else {
+ notice("Upload successful.")
+ }
+## # wait for mini-dinstall to get to work
+## upload_success = FALSE
+## for (i in seq(1,12)) {
+## if (file.exists(file.path(dinstall_archive,'testing',paste(pkg$srcname, '_', pkg$version, '.orig.tar.gz', sep='')))) {
+## upload_success = TRUE
+## break
+## }
+## warn(i,'/12: does not exist',file.path(dinstall_archive,'testing',paste(pkg$srcname, '_', pkg$version, '.orig.tar.gz', sep='')))
+## Sys.sleep(5)
+## }
+## if (!upload_success) {
+## warn('upload took too long; continuing as normal (some builds may fail temporarily)')
+## }
return(pkg$debversion)
})())
- cleanup(dir)
+ if (do_cleanup) {
+ cleanup(dir)
+ } else {
+ notice('output is in',dir,'. you must clean this up yourself.')
+ }
if (is.null(result)) {
# nothing was done so escape asap.
return(result)
notice('rebuilding',name,': no build record or previous build failed')
return(T)
}
- # see if it has already been built
+ # see if it has already been built *and* successfully uploaded
srcname <- pkgname_as_debian(name,binary=F)
debname <- pkgname_as_debian(name,binary=T)
if (file.exists(changesfile(srcname, version))) {
if (build$db_version != db_get_version()) {
notice('rebuilding',name,': new db version',build$db_version,'(old) vs',db_get_version(),'(new)')
}
+ notice(paste("Now deleting ",debname,", ",srcname,".\n",sep=""))
rm(debname,srcname)
return(T)
}
build_debian <- function(pkg) {
wd <- getwd()
+ #notice(paste("Now in path ",wd,"\n",sep=""))
setwd(pkg$path)
- notice('building Debian package'
- ,pkg$debname
- ,paste('(',pkg$debversion,')',sep='')
- ,'...')
+
+ notice('building Debian package',pkg$debname,paste('(',pkg$debversion,')',sep=''),'in',getwd(),'...')
cmd = paste('pdebuild --configfile',shQuote(pbuilder_config))
if (version_revision(pkg$debversion) > 2) {
cmd = paste(cmd,'--debbuildopts','-sd')
notice('build should exclude original source')
}
+ notice(paste("Executing ",'"',cmd,'"'," from directory '",getwd(),"'.\n",sep=""))
ret = log_system(cmd)
setwd(wd)
if (ret != 0) {
fail('Failed to build package.')
}
+ return(ret);
}