backportpackage: Correct uses of subprocess.call

This commit is contained in:
Evan Broder 2010-12-12 12:15:38 -08:00
parent 4669ee62af
commit 8ec0773201

View File

@ -50,14 +50,11 @@ def main(args):
tmpdir = tempfile.mkdtemp(prefix='backportpackage-') tmpdir = tempfile.mkdtemp(prefix='backportpackage-')
try: try:
for pocket in ('-updates', '-security', ''): for pocket in ('-updates', '-security', ''):
try: if 0 == subprocess.call(['pull-lp-source', package, source_release + pocket],
subprocess.check_call(['pull-lp-source', package, source_release + pocket],
cwd=tmpdir, cwd=tmpdir,
stdout=devnull, stderr=devnull) stdout=devnull, stderr=devnull):
logging.info('Found package %s in pocket %s' % (package, source_release + pocket)) logging.info('Found package %s in pocket %s' % (package, source_release + pocket))
break break
except subprocess.CalledProcessError:
continue
else: else:
error('Unable to find package %s in release %s' % (package, source_release)) error('Unable to find package %s in release %s' % (package, source_release))
@ -77,7 +74,7 @@ def main(args):
bp_version += '~ppa1' bp_version += '~ppa1'
elif upload == 'ubuntu': elif upload == 'ubuntu':
bp_dist += '-backports' bp_dist += '-backports'
if not subprocess.call(['dch', if 0 != subprocess.call(['dch',
'--force-bad-version', '--force-bad-version',
'--preserve', '--preserve',
'--newversion', bp_version, '--newversion', bp_version,
@ -85,7 +82,7 @@ def main(args):
'No-change backport to %s' % dest_release], 'No-change backport to %s' % dest_release],
cwd=srcdir): cwd=srcdir):
error('Something went wrong updating the package changelog') error('Something went wrong updating the package changelog')
if not subprocess.check_call(['debuild', '-S', '-sa'], if 0 != subprocess.call(['debuild', '-S', '-sa'],
cwd=srcdir): cwd=srcdir):
error('Something went wrong while building the source package') error('Something went wrong while building the source package')
@ -100,7 +97,7 @@ def main(args):
elif answer in ('n', 'no'): elif answer in ('n', 'no'):
return 2 return 2
if not subprocess.check_call(['dput', if 0 != subprocess.call(['dput',
upload, upload,
'%s_%s_source.changes' % (package, bp_version)], '%s_%s_source.changes' % (package, bp_version)],
cwd=tmpdir): cwd=tmpdir):