Merge lp:~mvo/aptdaemon/lp1058038 into lp:aptdaemon

[Michael Vogt]

Workaround for that ensures that the sys.getfilesystemencoding() is valid
when auto-activated without LANG/LANGUAGE environment

[Michael Vogt (mvo)]

To test:
$ mkdir /tmp/äää
$ (cd /tmp/äää ; apt-get download 2vcard)
$ aptdcon --install /tmp/äää/2vcard*.deb

this will crash with the default aptd and work once the new one is installed/restarted.

Unmerged revisions

863. By Michael Vogt on 2012-10-08

re-exec if there is no LANG set to force C.UTF-8 in this case to have a utf8 sys.getfilesystemencoding() instead of a ascii one, see LP: #1058038

=== modified file 'aptd'
--- aptd	2012-05-11 16:21:16 +0000
+++ aptd	2012-10-08 11:37:49 +0000
@@ -22,9 +22,18 @@
 __author__  = "Sebastian Heinlein <[e-mail]>"
 __state__   = "experimental"
 
+import os
+import sys
+
 import aptdaemon.core
 
 if __name__ == "__main__":
+    # workaround bug LP: #1058038 by ensuring that the default fs encoding is
+    # set
+    if (sys.getfilesystemencoding() == "ascii" and 
+        not "LANG" in os.environ):
+        os.environ["LANG"] = "C.UTF-8"
+        os.execv(sys.argv[0], sys.argv)
     aptdaemon.core.main()
 
 # vim:ts=4:sw=4:et