syncpackage: Show a error message instead of raising an error if Ubuntu contains a newer version.

This commit is contained in:
Benjamin Drung 2010-10-30 20:13:07 +02:00
parent b403dedbfb
commit 7241b30c16
2 changed files with 7 additions and 3 deletions

4
debian/changelog vendored
View File

@ -33,8 +33,10 @@ ubuntu-dev-tools (0.105) UNRELEASED; urgency=low
* syncpackage: * syncpackage:
- Don't crash if environment variables aren't set (LP: #665202). - Don't crash if environment variables aren't set (LP: #665202).
- Don't add quotation marks to changelog entries (LP: #668805). - Don't add quotation marks to changelog entries (LP: #668805).
- Show a error message instead of raising an error if Ubuntu contains a
newer version.
-- Benjamin Drung <bdrung@ubuntu.com> Sat, 30 Oct 2010 19:56:33 +0200 -- Benjamin Drung <bdrung@ubuntu.com> Sat, 30 Oct 2010 20:10:39 +0200
ubuntu-dev-tools (0.104) experimental; urgency=low ubuntu-dev-tools (0.104) experimental; urgency=low

View File

@ -216,8 +216,10 @@ def sync_dsc(script_name, dscurl, debian_dist, release, name, email, bugs,
# No need to continue if version is not greater than current one # No need to continue if version is not greater than current one
if new_ver <= ubuntu_ver: if new_ver <= ubuntu_ver:
raise Exception('%s version %s is not greater than already available ' parameters = (script_name, srcpkg, new_ver, ubuntu_ver)
'%s' % (srcpkg, new_ver, ubuntu_ver)) print >> sys.stderr, ("%s: Error: %s version %s is not greater than "
"already available %s") % parameters
sys.exit(1)
if verbose: if verbose:
print '%s: D: Source %s: current version %s, new version %s' % \ print '%s: D: Source %s: current version %s, new version %s' % \
(script_name, srcpkg, ubuntu_ver, new_ver) (script_name, srcpkg, ubuntu_ver, new_ver)