Merge lp:~barry/ubuntu/precise/ubuntu-dev-tools/bug-881049 into lp:ubuntu/precise/ubuntu-dev-tools

[Barry Warsaw]

Fixes the described problems.

[Stefano Rivera (stefanor)]

Not necessary, already dealt with.

[Stefano Rivera (stefanor)]

review: Disapprove

Unmerged revisions

61. By Barry Warsaw on 2011-10-24

- Print the correct URL when the change log cannot be retrieved.
- Fail gracefully when get_debian_changelog() returns None

LP: #881049

=== modified file 'syncpackage'
--- syncpackage	2011-10-17 16:35:36 +0000
+++ syncpackage	2011-10-24 19:19:24 +0000
@@ -365,7 +365,11 @@
                       src_pkg.source, ubuntu_series, ubuntu_pocket,
                       src_pkg.version)
 
-    changes = get_debian_changelog(debian_spph, base_version).strip()
+    changes = get_debian_changelog(debian_spph, base_version)
+    if changes is None:
+        Logger.error('Cannot retrieve changelog')
+        sys.exit(1)
+    changes = changes.strip()
     if changes:
         Logger.normal("New changes:\n%s", changes)
 

=== modified file 'ubuntutools/requestsync/common.py'
--- ubuntutools/requestsync/common.py	2011-09-10 16:48:23 +0000
+++ ubuntutools/requestsync/common.py	2011-10-24 19:19:24 +0000
@@ -65,7 +65,7 @@
     try:
         return Changelog(urllib2.urlopen(url))
     except urllib2.HTTPError, error:
-        print >> sys.stderr, ('Unable to connect to %s: %s' % (base, error))
+        print >> sys.stderr, ('%s: %s' % (url, error))
         return None
 
 # TODO: Move this into requestsync.mail, and implement an LP version