[patch] layman-encoding.patch

layman-encoding.patch (text/plain), 1.91 KB, created by Arfrever Frehtes Taifersar Arahesis (RETIRED) on 2008-08-23 16:57:15 UTC

--- layman/action.py
+++ layman/action.py
@@ -96,7 +96,8 @@
 	    self.selection = self.db.overlays.keys()
 
         enc = sys.getfilesystemencoding()
-        self.selection = [i.decode(enc) for i in self.selection]
+        if enc:
+            self.selection = [i.decode(enc) for i in self.selection]
 
     def run(self):
         '''Synchronize the overlays.'''
@@ -157,7 +158,8 @@
         self.selection = config['add']
 
         enc = sys.getfilesystemencoding()
-        self.selection = [i.decode(enc) for i in self.selection]
+        if enc:
+            self.selection = [i.decode(enc) for i in self.selection]
 
         if 'ALL' in self.selection:
             self.selection = self.rdb.overlays.keys()
@@ -204,7 +206,8 @@
         self.selection = config['delete']
 
         enc = sys.getfilesystemencoding()
-        self.selection = [i.decode(enc) for i in self.selection]
+        if enc:
+            self.selection = [i.decode(enc) for i in self.selection]
 
         if 'ALL' in self.selection:
             self.selection = self.db.overlays.keys()
@@ -281,7 +284,8 @@
         self.selection = config['info']
 
         enc = sys.getfilesystemencoding()
-        self.selection = [i.decode(enc) for i in self.selection]
+        if enc:
+            self.selection = [i.decode(enc) for i in self.selection]
 
         if 'ALL' in self.selection:
             self.selection = self.rdb.overlays.keys()
--- layman/overlays/overlay.py
+++ layman/overlays/overlay.py
@@ -154,8 +154,9 @@
         OUT.info('Running command "' + command + '"...', 2)
 
         if hasattr(sys.stdout,'encoding'):
-            command = command.encode(sys.stdout.encoding or 
-                                     sys.getfilesystemencoding())
+            enc = sys.stdout.encoding or sys.getfilesystemencoding()
+            if enc:
+                command = command.encode(enc)
 
         if not self.quiet:
             return os.system(command)