Bug#531173: debomatic: Please allow custom pbuilder command
On Wed, 10 Jun 2009 09:14:57 +0200 Luca Falavigna wrote: > Karl Goetz ha scritto: > > What will I need to try and apply the patch against? A bzr > > checkout, or a particular version of the package? > > This is against latest bzr checkout, but I can prepare one for current > package in testing, or in stable (changes are easily adaptable). > I'll branch from bzr - it might fix the 'cant kill from foreground' bug before I file it. -- Karl Goetz, (Kamping_Kaiser / VK5FOSS) Debian contributor / gNewSense Maintainer http://www.kgoetz.id.au No, I won't join your social networking group signature.asc Description: PGP signature
Bug#531173: debomatic: Please allow custom pbuilder command
Karl Goetz ha scritto: > What will I need to try and apply the patch against? A bzr checkout, or > a particular version of the package? This is against latest bzr checkout, but I can prepare one for current package in testing, or in stable (changes are easily adaptable). -- . ''`. Luca Falavigna : :' : Ubuntu MOTU Developer `. `'` Debian Maintainer `- GPG Key: 0x86BC2A50 signature.asc Description: OpenPGP digital signature
Bug#531173: debomatic: Please allow custom pbuilder command
On Thu, 4 Jun 2009 21:59:22 +0200 Luca Falavigna wrote: > Attached patch should implement this, mind giving it a try? > What will I need to try and apply the patch against? A bzr checkout, or a particular version of the package? kk -- Karl Goetz, (Kamping_Kaiser / VK5FOSS) Debian contributor / gNewSense Maintainer http://www.kgoetz.id.au No, I won't join your social networking group signature.asc Description: PGP signature
Bug#531173: debomatic: Please allow custom pbuilder command
On Thu, 4 Jun 2009 21:59:22 +0200 Luca Falavigna wrote: > Attached patch should implement this, mind giving it a try? > I will have a try later in the week, Unfortunately I'm a bit busy the next few days :( kk -- Karl Goetz, (Kamping_Kaiser / VK5FOSS) Debian contributor / gNewSense Maintainer http://www.kgoetz.id.au No, I won't join your social networking group signature.asc Description: PGP signature
Bug#531173: debomatic: Please allow custom pbuilder command
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 +
+++ Debomatic/build.py 2009-06-04 19:34:36 +
@@ -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 +
+++ Debomatic/debomatic.py 2009-06-04 19:37:53 +
@@ -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 +
+++ Debomatic/pbuilder.py 2009-06-04 19:36:48 +
@@ -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 +
+++ configfiles/debomatic.conf 2009-06-04 19:34:27 +
@@ -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
Bug#531173: debomatic: Please allow custom pbuilder command
On Sat, 30 May 2009 15:59:34 +0200 Luca Falavigna wrote: Would you like me to CC you, or is it ok to just email the bug? (I can stop sending you dupe mail if your getting it twice). > I don't know qemubuilder/cowbuilder too much, but I think they should > have the same standar command sets of pbuilder (and nothing that can't > be adjusted in pbuilderrc). The qemubuilder manual page says "Most commands imitate pbuilder, see pbuilder manual for details", so hopefully its similar enough. (The section thats meant to list them says "TBD" :/) > > If that's the case, I could probably decide to not hardcode pbuilder > anymore and let the user to decide which builder to use. > kk -- Karl Goetz, (Kamping_Kaiser / VK5FOSS) Debian contributor / gNewSense Maintainer signature.asc Description: PGP signature
Bug#531173: debomatic: Please allow custom pbuilder command
I don't know qemubuilder/cowbuilder too much, but I think they should have the same standar command sets of pbuilder (and nothing that can't be adjusted in pbuilderrc). If that's the case, I could probably decide to not hardcode pbuilder anymore and let the user to decide which builder to use. -- . ''`. Luca Falavigna : :' : Ubuntu MOTU Developer `. `'` Debian Maintainer `- GPG Key: 0x86BC2A50 signature.asc Description: PGP signature
Bug#531173: debomatic: Please allow custom pbuilder command
Package: debomatic Severity: normal I don't know what would be involved in this, but it would be handy to have a custom pbuilder command. This would alow for using qemubuilder/cowbuilder and others instead of pbuilder. thanks, Karl -- System Information: Debian Release: squeeze/sid APT prefers testing APT policy: (500, 'testing') Architecture: i386 (i686) Kernel: Linux 2.6.26-2-vserver-686 (SMP w/1 CPU core) Locale: LANG=en_AU.UTF-8, LC_CTYPE=en_AU.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
