Line
Link Here
|
0 |
-- layman/action.py |
0 |
++ layman/action.py |
Lines 96-102
Link Here
|
96 |
self.selection = self.db.overlays.keys() |
96 |
self.selection = self.db.overlays.keys() |
97 |
|
97 |
|
98 |
enc = sys.getfilesystemencoding() |
98 |
enc = sys.getfilesystemencoding() |
99 |
self.selection = [i.decode(enc) for i in self.selection] |
99 |
if enc: |
|
|
100 |
self.selection = [i.decode(enc) for i in self.selection] |
100 |
|
101 |
|
101 |
def run(self): |
102 |
def run(self): |
102 |
'''Synchronize the overlays.''' |
103 |
'''Synchronize the overlays.''' |
Lines 157-163
Link Here
|
157 |
self.selection = config['add'] |
158 |
self.selection = config['add'] |
158 |
|
159 |
|
159 |
enc = sys.getfilesystemencoding() |
160 |
enc = sys.getfilesystemencoding() |
160 |
self.selection = [i.decode(enc) for i in self.selection] |
161 |
if enc: |
|
|
162 |
self.selection = [i.decode(enc) for i in self.selection] |
161 |
|
163 |
|
162 |
if 'ALL' in self.selection: |
164 |
if 'ALL' in self.selection: |
163 |
self.selection = self.rdb.overlays.keys() |
165 |
self.selection = self.rdb.overlays.keys() |
Lines 204-210
Link Here
|
204 |
self.selection = config['delete'] |
206 |
self.selection = config['delete'] |
205 |
|
207 |
|
206 |
enc = sys.getfilesystemencoding() |
208 |
enc = sys.getfilesystemencoding() |
207 |
self.selection = [i.decode(enc) for i in self.selection] |
209 |
if enc: |
|
|
210 |
self.selection = [i.decode(enc) for i in self.selection] |
208 |
|
211 |
|
209 |
if 'ALL' in self.selection: |
212 |
if 'ALL' in self.selection: |
210 |
self.selection = self.db.overlays.keys() |
213 |
self.selection = self.db.overlays.keys() |
Lines 281-287
Link Here
|
281 |
self.selection = config['info'] |
284 |
self.selection = config['info'] |
282 |
|
285 |
|
283 |
enc = sys.getfilesystemencoding() |
286 |
enc = sys.getfilesystemencoding() |
284 |
self.selection = [i.decode(enc) for i in self.selection] |
287 |
if enc: |
|
|
288 |
self.selection = [i.decode(enc) for i in self.selection] |
285 |
|
289 |
|
286 |
if 'ALL' in self.selection: |
290 |
if 'ALL' in self.selection: |
287 |
self.selection = self.rdb.overlays.keys() |
291 |
self.selection = self.rdb.overlays.keys() |
288 |
-- layman/overlays/overlay.py |
292 |
++ layman/overlays/overlay.py |
Lines 154-161
Link Here
|
154 |
OUT.info('Running command "' + command + '"...', 2) |
154 |
OUT.info('Running command "' + command + '"...', 2) |
155 |
|
155 |
|
156 |
if hasattr(sys.stdout,'encoding'): |
156 |
if hasattr(sys.stdout,'encoding'): |
157 |
command = command.encode(sys.stdout.encoding or |
157 |
enc = sys.stdout.encoding or sys.getfilesystemencoding() |
158 |
sys.getfilesystemencoding()) |
158 |
if enc: |
|
|
159 |
command = command.encode(enc) |
159 |
|
160 |
|
160 |
if not self.quiet: |
161 |
if not self.quiet: |
161 |
return os.system(command) |
162 |
return os.system(command) |