Attached patch should implement this, mind giving it a try? -- . ''`. Luca Falavigna : :' : Ubuntu MOTU Developer `. `'` Debian Maintainer `- GPG Key: 0x86BC2A50
=== modified file 'Debomatic/build.py'
--- Debomatic/build.py 2009-05-30 16:59:53 +0000
+++ Debomatic/build.py 2009-06-04 19:34:36 +0000
@@ -127,10 +127,11 @@
os.mkdir(os.path.join(distdir, 'pool', packageversion))
mod_sys.execute_hook('pre_build', { 'directory': distdir, 'package': packageversion, \
'cfg': configfile, 'distribution': distopts['distribution'], 'dsc': dscfile[0]})
- os.system('pbuilder build --basetgz %(directory)s/%(distribution)s \
+ os.system('%(builder)s build --basetgz %(directory)s/%(distribution)s \
--override-config --configfile %(cfg)s --logfile %(directory)s/pool/%(package)s/%(package)s.buildlog \
--buildplace %(directory)s/build --buildresult %(directory)s/pool/%(package)s \
- --aptcache %(directory)s/aptcache %(dsc)s >/dev/null 2>&1' % { 'directory': distdir, 'package': packageversion, \
+ --aptcache %(directory)s/aptcache %(dsc)s >/dev/null 2>&1' \
+ % { 'builder': Options.get('default', 'builder'), 'directory': distdir, 'package': packageversion, \
'cfg': configfile, 'distribution': distopts['distribution'], 'dsc': dscfile[0]})
mod_sys.execute_hook('post_build', { 'directory': distdir, 'package': packageversion, \
'cfg': configfile, 'distribution': distopts['distribution'], 'dsc': dscfile[0]})
=== modified file 'Debomatic/debomatic.py'
--- Debomatic/debomatic.py 2009-05-16 01:44:07 +0000
+++ Debomatic/debomatic.py 2009-06-04 19:37:53 +0000
@@ -82,7 +82,7 @@
launcher()
def parse_default_options(conffile):
- defaultoptions = ('packagedir', 'configdir', 'maxbuilds', 'inotify', 'sleep', 'logfile')
+ defaultoptions = ('builder', 'packagedir', 'configdir', 'maxbuilds', 'inotify', 'sleep', 'logfile')
if not conffile:
print 'Please specify a configuration file'
sys.exit(-1)
=== modified file 'Debomatic/pbuilder.py'
--- Debomatic/pbuilder.py 2009-05-30 16:59:53 +0000
+++ Debomatic/pbuilder.py 2009-06-04 19:36:48 +0000
@@ -77,12 +77,13 @@
os.mkdir(os.path.join(directory, 'aptcache'))
if not os.path.exists(os.path.join(directory, 'logs')):
os.mkdir(os.path.join(directory, 'logs'))
- if (os.system('pbuilder %(cmd)s --basetgz %(directory)s/%(distribution)s \
+ if (os.system('%(builder)s %(cmd)s --basetgz %(directory)s/%(distribution)s \
--override-config --configfile %(cfg)s --buildplace %(directory)s/build \
--aptcache "%(directory)s/aptcache" --logfile %(directory)s/logs/%(cmd)s.%(now)s >/dev/null 2>&1' \
- % {'cmd': cmd, 'directory': directory, 'distribution': distopts['distribution'], \
- 'cfg': os.path.join(configdir, distopts['distribution']), 'now': strftime('%Y%m%d_%H%M')})):
- print 'pbuilder (%s) failed' % cmd
+ % {'builder': Options.get('default', 'builder'), 'cmd': cmd, 'directory': directory, \
+ 'distribution': distopts['distribution'], 'cfg': os.path.join(configdir, distopts['distribution']), \
+ 'now': strftime('%Y%m%d_%H%M')})):
+ print '%s (%s) failed' % (Options.get('default', 'builder'), cmd)
locks.pbuilderlock_release(distopts['distribution'])
return False
=== modified file 'configfiles/debomatic.conf'
--- configfiles/debomatic.conf 2009-05-25 20:05:04 +0000
+++ configfiles/debomatic.conf 2009-06-04 19:34:27 +0000
@@ -5,6 +5,9 @@
# Default section
[default]
+# Set this option to the builder tool you want to use (pbuilder or cowbuilder)
+builder: pbuilder
+
# Set this option to the directory where you will upload your source packages
packagedir: /incoming
signature.asc
Description: PGP signature
