Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-03-24 17:31:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

ack-sync: Fix undefined variables.

Browse Source
This commit is contained in:
Benjamin Drung 2010-12-28 19:59:34 +01:00
parent fd667bdd5f
commit 9e95b512f5
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ack-sync
View File

@ -51,7 +51,7 @@ def strip_epoch(version):
version = ':'.join(parts) version = ':'.join(parts)
return version return version
def LogCall(command): def log_call(command):
command = map(str, command) command = map(str, command)
logging.info("Running %s", " ".join(command)) logging.info("Running %s", " ".join(command))
return command return command
@ -88,22 +88,22 @@ def get_source(package, version, section, dist, uploader_name, uploader_email,
sys.exit(1) sys.exit(1)
return dsc_file return dsc_file
def build_source(dist, dsc_file): def build_source(dist, dsc_file, pbuilder, sbuild):
try: try:
if sbuild: if sbuild:
cmd = ["sbuild", "-d", dist, "-A", dsc_file] cmd = ["sbuild", "-d", dist, "-A", dsc_file]
subprocess.check_call(LogCall(cmd)) subprocess.check_call(log_call(cmd))
else: else:
if not os.path.isdir("buildresult"): if not os.path.isdir("buildresult"):
os.makedirs("buildresult") os.makedirs("buildresult")
cmd = ["sudo", "-E", "DIST=" + dist, pbuilder, "--build", cmd = ["sudo", "-E", "DIST=" + dist, pbuilder, "--build",
"--buildresult", "buildresult", dsc_file] "--buildresult", "buildresult", dsc_file]
subprocess.check_call(LogCall(cmd)) subprocess.check_call(log_call(cmd))
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
print >> sys.stderr, "E: %s failed to build." % (dsc_file) print >> sys.stderr, "E: %s failed to build." % (dsc_file)
sys.exit(1) sys.exit(1)
def test_install(dist, dsc_file): def test_install(dist, dsc_file, sbuild, lvm):
changes_files = glob.glob(os.path.splitext(dsc_file)[0]+"_*.changes") changes_files = glob.glob(os.path.splitext(dsc_file)[0]+"_*.changes")
changes_file = "" changes_file = ""
@ -122,9 +122,9 @@ def test_install(dist, dsc_file):
"restricted multiverse", changes_file] "restricted multiverse", changes_file]
if sbuild: if sbuild:
lvm_volume = lvm + "/" + dist + "_chroot" lvm_volume = lvm + "/" + dist + "_chroot"
subprocess.check_call(LogCall(cmd + ["--lvm-volume="+lvm_volume])) subprocess.check_call(log_call(cmd + ["--lvm-volume="+lvm_volume]))
else: else:
subprocess.check_call(LogCall(cmd + ["--pbuilder"])) subprocess.check_call(log_call(cmd + ["--pbuilder"]))
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
print >> sys.stderr, "E: %s failed to install. Please check log" % \ print >> sys.stderr, "E: %s failed to install. Please check log" % \
(changes_file) (changes_file)
@ -154,8 +154,8 @@ def unsubscribe_sponsors(launchpad, bug):
def ack_sync(bug_numbers, all_package, all_version, all_section, update, def ack_sync(bug_numbers, all_package, all_version, all_section, update,
all_uploader_email, key, upload, lpinstance, verbose=False, all_uploader_email, key, upload, lpinstance, pbuilder, sbuild, lvm,
silent=False): piuparts, verbose, verbose=False, silent=False):
launchpad = get_launchpad("ubuntu-dev-tools", server=lpinstance) launchpad = get_launchpad("ubuntu-dev-tools", server=lpinstance)
# TODO: use release-info (once available) # TODO: use release-info (once available)
series = launchpad.distributions["ubuntu"].current_series series = launchpad.distributions["ubuntu"].current_series
@ -164,10 +164,10 @@ def ack_sync(bug_numbers, all_package, all_version, all_section, update,
# update pbuilder # update pbuilder
if update: if update:
if sbuild: if sbuild:
subprocess.call(LogCall(["sbuild-update", dist])) subprocess.call(log_call(["sbuild-update", dist]))
else: else:
cmd = ["sudo", "-E", "DIST=" + dist, pbuilder, "--update"] cmd = ["sudo", "-E", "DIST=" + dist, pbuilder, "--update"]
subprocess.call(LogCall(cmd)) subprocess.call(log_call(cmd))
for bug_number in bug_numbers: for bug_number in bug_numbers:
bug = launchpad.bugs[bug_number] bug = launchpad.bugs[bug_number]
@ -270,10 +270,10 @@ def ack_sync(bug_numbers, all_package, all_version, all_section, update,
env['DEB_VENDOR'] = 'Ubuntu' env['DEB_VENDOR'] = 'Ubuntu'
subprocess.check_call(["dpkg-source", "-x", dsc_file], env=env) subprocess.check_call(["dpkg-source", "-x", dsc_file], env=env)
build_source(dist, dsc_file) build_source(dist, dsc_file, pbuilder, sbuild)
if piuparts: if piuparts:
test_install(dist, dsc_file) test_install(dist, dsc_file, sbuild, lvm)
print bug.title print bug.title
print '%s (was %s)' % (task.status, old_status) print '%s (was %s)' % (task.status, old_status)
@ -430,7 +430,8 @@ def main():
#TODO: Support WORKDIR #TODO: Support WORKDIR
ack_sync(bug_numbers, package, version, section, update, uploader_email, ack_sync(bug_numbers, package, version, section, update, uploader_email,
key, upload, lpinstance, verbose, silent) key, upload, lpinstance, pbuilder, sbuild, lvm, piuparts, verbose,
silent)
if __name__ == '__main__': if __name__ == '__main__':
main() main()