improved clarity of the code. Change of
semantics: the system for the very moment
does not fail upon the failure of the
packaging process of a single package.
This will become a paramter to set with
a very soon further commit.
git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@331
edb9625f-4e0d-4859-8d74-
9fd3b1da38cb
# obtain the Debian version-to-be
version <- try(new_build_version(name))
if (inherits(version,'try-error')) {
# 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)
file.remove(Sys.glob(file.path(pbuilder_results,'*.upload')))
notice('R dependencies:',paste(pkg$depends$r,collapse=', '))
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=""))
+ #if (debug) notice(paste("build_debian(",pkg,") completed.\n",sep=""))
+
+ notice("Package upload")
## ret = log_system('umask 002;dput','-c',shQuote(dput_config),'local' ,changesfile(pkg$srcname,pkg$debversion))
## ret = log_system('umask 002;dput','-c',shQuote(dput_config),'local' ,changesfile(pkg$srcname,pkg$debversion))
- ret = log_system('umask 002; cd /var/www/rep; reprepro -b . include testing', 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)
- 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)) {
## # wait for mini-dinstall to get to work
## upload_success = FALSE
## for (i in seq(1,12)) {
if (build$db_version != db_get_version()) {
notice('rebuilding',name,': new db version',build$db_version,'(old) vs',db_get_version(),'(new)')
}
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()
rm(debname,srcname)
return(T)
}
build_debian <- function(pkg) {
wd <- getwd()
+ #notice(paste("Now in path ",wd,"\n",sep=""))
notice('building Debian package'
,pkg$debname
,paste('(',pkg$debversion,')',sep='')
notice('building Debian package'
,pkg$debname
,paste('(',pkg$debversion,')',sep='')
,'...')
cmd = paste('pdebuild --configfile',shQuote(pbuilder_config))
,'...')
cmd = paste('pdebuild --configfile',shQuote(pbuilder_config))
cmd = paste(cmd,'--debbuildopts','-sd')
notice('build should exclude original source')
}
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.')
}
ret = log_system(cmd)
setwd(wd)
if (ret != 0) {
fail('Failed to build package.')
}