Mercurial > treepkg > treepkg
diff treepkg/packager.py @ 51:e1028211d34b
merge
author | Bernhard Herzog <bh@intevation.de> |
---|---|
date | Tue, 03 Apr 2007 16:09:35 +0200 |
parents | 3e610233ccfe 38d66dc6a1e5 |
children | 6b5f7f7575f6 |
line wrap: on
line diff
--- a/treepkg/packager.py Tue Mar 20 17:27:46 2007 +0100 +++ b/treepkg/packager.py Tue Apr 03 16:09:35 2007 +0200 @@ -188,9 +188,12 @@ util.ensure_directory(self.binary_dir) logging.info("Building binary package; loging to %r", self.logfile) run.call(cmdexpand("@rootcmd /usr/sbin/pbuilder build" + " --configfile $pbuilderrc" " --logfile $logfile --buildresult $bindir $dsc", - rootcmd=self.pkg_line.root_cmd, logfile=self.logfile, - bindir=self.binary_dir, dsc=self.dsc_file), + rootcmd=self.pkg_line.root_cmd, + pbuilderrc=self.pkg_line.pbuilderrc, + logfile=self.logfile, bindir=self.binary_dir, + dsc=self.dsc_file), suppress_output=True) self.status.binary_package_created() @@ -257,12 +260,13 @@ extra_config_desc = [] - def __init__(self, name, base_dir, svn_url, root_cmd, deb_email, + def __init__(self, name, base_dir, svn_url, root_cmd, pbuilderrc, deb_email, deb_fullname, packager_class="treepkg.packager"): self.name = name self.base_dir = base_dir self.svn_url = svn_url self.root_cmd = root_cmd + self.pbuilderrc = pbuilderrc self.deb_email = deb_email self.deb_fullname = deb_fullname self.pkg_dir_template = "%(revision)d-%(increment)d"