Merge lp:~al-maisan/bzr-builddeb/bd-merge-failure-no-source-uris into lp:~bzr-builddeb-hackers/bzr-builddeb/trunk-old

[Muharem Hrnjadovic]

[Muharem Hrnjadovic (al-maisan)]

Hello,

this branch adds code that handles the case where the apt.sources file contains no source URIs (see bug #375897 for more detail). Please have a look and let me know what you think.

Thanks!

[James Westby (james-w)]

Looks good, thanks.

James

review: Approve

=== modified file 'upstream.py'
--- upstream.py	2009-08-24 17:33:44 +0000
+++ upstream.py	2009-09-11 18:02:26 +0000
@@ -96,7 +96,14 @@
         else:
             apt_pkg = _apt_pkg
         apt_pkg.init()
-        sources = apt_pkg.GetPkgSrcRecords()
+
+        # Handle the case where the apt.sources file contains no source
+        # URIs (LP:375897)
+        try:
+            sources = apt_pkg.GetPkgSrcRecords()
+        except SystemError:
+            raise PackageVersionNotPresent(package, upstream_version, self)
+
         sources.Restart()
         info("Using apt to look for the upstream tarball.")
         while sources.Lookup(package):