| 1 |
Author: zmedico |
| 2 |
Date: 2009-08-04 20:00:20 +0000 (Tue, 04 Aug 2009) |
| 3 |
New Revision: 13906 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/bin/portageq |
| 7 |
Log: |
| 8 |
Decode arguments to unicode if necessary (needed at least for unicode file |
| 9 |
names passed to the owners command). |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/bin/portageq |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/bin/portageq 2009-08-04 19:40:57 UTC (rev 13905) |
| 15 |
+++ main/trunk/bin/portageq 2009-08-04 20:00:20 UTC (rev 13906) |
| 16 |
@@ -605,10 +605,15 @@ |
| 17 |
sys.path.insert(0, pym_path) |
| 18 |
import portage |
| 19 |
|
| 20 |
+ args = sys.argv[2:] |
| 21 |
+ if args and not isinstance(args[0], unicode): |
| 22 |
+ for i in xrange(len(args)): |
| 23 |
+ args[i] = unicode(args[i], encoding='utf_8', errors='replace') |
| 24 |
+ |
| 25 |
try: |
| 26 |
if uses_root: |
| 27 |
- sys.argv[2] = portage.settings["ROOT"] |
| 28 |
- retval = function(sys.argv[2:]) |
| 29 |
+ args[0] = portage.settings["ROOT"] |
| 30 |
+ retval = function(args) |
| 31 |
if retval: |
| 32 |
sys.exit(retval) |
| 33 |
except portage.exception.PermissionDenied, e: |
Archives