Merge lp:~cr3/unattended-upgrades/1046438 into lp:~ubuntu-core-dev/unattended-upgrades/ubuntu

[Marc Tardif]

These are the same changes that were proposed downstream:

https://code.launchpad.net/~cr3/ubuntu/quantal/unattended-upgrades/1046438/+merge/122914

This is the third attempt...

[Michael Vogt (mvo)]

Thanks, merged. For some reason LP put it into the wrong branch but its in my ubuntu branch now.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-09-10 08:08:24 +0000
+++ debian/changelog	2012-09-13 20:40:26 +0000
@@ -1,3 +1,9 @@
+unattended-upgrades (0.79.3ubuntu2) precise; urgency=low
+
+  * Fixed debug output when a package has no candidates (LP: #1046438)
+
+ -- Marc Tardif <[e-mail]>  Thu, 13 Sep 2012 16:16:04 -0400
+
 unattended-upgrades (0.79.3ubuntu1) quantal; urgency=low
 
   [ Thomas Kluyver ]

=== modified file 'unattended-upgrade'
--- unattended-upgrade	2012-09-07 07:11:25 +0000
+++ unattended-upgrade	2012-09-13 20:40:26 +0000
@@ -853,7 +853,7 @@
     for pkg in cache:
         if options.debug and pkg.is_upgradable:
             logging.debug("Checking: %s (%s)" % (
-                    pkg.name, map(str, pkg.candidate.origins)))
+                    pkg.name, map(str, getattr(pkg.candidate, "origins", []))))
         if (pkg.is_upgradable and
             not is_pkgname_in_blacklist(pkg.name, blacklisted_pkgs) and
             is_allowed_origin(pkg.candidate, allowed_origins)):