Merge lp:~takluyver/unattended-upgrades/apt-lock-crash into lp:~ubuntu-core-dev/unattended-upgrades/ubuntu

[Thomas Kluyver]

I ran into a bytes/unicode crash on Quantal, and while fixing it, I noticed that a variable could end up undefined.

I can't get it to go into that code path now, but this change should fix things if it does end up there.

[Michael Vogt (mvo)]

Thanks, I merged this to trunk (and added a test).

review: Approve

=== modified file 'unattended-upgrade'
--- unattended-upgrade	2012-10-09 08:10:08 +0000
+++ unattended-upgrade	2012-11-08 14:08:26 +0000
@@ -722,7 +722,8 @@
                 cache, [pkg.name for pkg in pkgs_to_upgrade], logfile_dpkg)
     except Exception as e:
         # print unhandled exceptions here this way, while stderr is redirected
-        os.write(old_stderr, "Exception: %s" % e)
+        os.write(old_stderr, ("Exception: %s\n" % e).encode('utf-8'))
+        pkg_install_success = False
 
     # restore
     os.dup2(old_stdout, 1)