Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-05-18 12:21:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

sponsor-patch: Fix builder update logic.

Browse Source
This commit is contained in:
Benjamin Drung 2010-12-17 11:49:22 +01:00
parent 409762e55c
commit ec60ffc00e
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sponsor-patch
View File

@ -598,21 +598,24 @@ def main(script_name, bug_number, update, build, edit, keyid, upload, workdir,
continue continue
if build: if build:
dist = re.sub("-.*$", "", changelog.distributions)
if update: if update:
ret = builder.update() ret = builder.update(dist)
if ret != 0: if ret != 0:
Logger.error("Failed to update %s chroot for %s." % \ Logger.error("Failed to update %s chroot for %s." % \
(changelog.distributions, (dist, builder.get_name()))
builder.get_name()))
ask_for_manual_fixing() ask_for_manual_fixing()
continue continue
# We want to update the build environment only once, but not
# after every manual fix.
update = False
buildresult = os.path.join(workdir, task.package + "-buildresult") buildresult = os.path.join(workdir, task.package + "-buildresult")
if not os.path.isdir(buildresult): if not os.path.isdir(buildresult):
os.makedirs(buildresult) os.makedirs(buildresult)
# build package # build package
dist = re.sub("-.*$", "", changelog.distributions)
result = builder.build(new_dsc_file, dist, buildresult) result = builder.build(new_dsc_file, dist, buildresult)
if result != 0: if result != 0:
Logger.error("Failed to build %s from source with %s." % \ Logger.error("Failed to build %s from source with %s." % \