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

[Marc Tardif]

* Fixed debug output when a package has no candidates (LP: #1046438)

[Brian Murray (brian-murray)]

The development branch of unattended-upgrades is http://bazaar.launchpad.net/~ubuntu-core-dev/unattended-upgrades/ubuntu/ and it would be great if you could have your merge proposal be into that branch.

Additionally, if the Ubuntu branch were up to date, which it doesn't look like it is, you want to create a new changelog entry not modify an existing changelog entry for an already released package.

Thanks!

review: Needs Fixing

[Brian Murray (brian-murray)]

Ping me when you have a new merge proposal and I'll be happy to merge it.

[Marc Tardif (cr3)]

Sorry for the delay, here is the merge request upstream:

https://code.launchpad.net/~cr3/unattended-upgrades/1046438/+merge/124292

Should I still modify the changelog to create another entry in this branch?

Unmerged revisions

27. By Marc Tardif on 2012-09-05

Fixed debug output when a package has no candidates (LP: #1046438)

=== modified file 'debian/changelog'
--- debian/changelog	2011-12-12 14:01:41 +0000
+++ debian/changelog	2012-09-05 17:23:18 +0000
@@ -1,11 +1,15 @@
 unattended-upgrades (0.75.1) unstable; urgency=low
 
+  [ Michael Vogt ]
   * print conffile hold-backs to stdout to ensure its part of
     the cron mail (LP: #773007), thanks to Jean-Baptiste Lallement
   * unattended-upgrade:
     - fix crash on automatic-reboot, thanks to Teodor (closes: #651822)
   * typo fixes, thanks to Lei Zhang
 
+  [ Marc Tardif ]
+  * Fixed debug output when a package has no candidates (LP: #1046438)
+
  -- Michael Vogt <[e-mail]>  Mon, 12 Dec 2011 14:01:41 +0100
 
 unattended-upgrades (0.75) unstable; urgency=low

=== modified file 'unattended-upgrade'
--- unattended-upgrade	2011-12-12 14:01:41 +0000
+++ unattended-upgrade	2012-09-05 17:23:18 +0000
@@ -663,7 +663,7 @@
     # now do the actual upgrade
     for pkg in cache:
         if options.debug and pkg.is_upgradable:
-            logging.debug("Checking: %s (%s)" % (pkg.name, map(str, pkg.candidate.origins)))
+            logging.debug("Checking: %s (%s)" % (pkg.name, map(str, getattr(pkg.candidate, "origins", []))))
         if (pkg.is_upgradable and 
 	    is_allowed_origin(pkg.candidate, allowed_origins)):
             try: