| 1 |
commit: 750eff068d0337159c0367c9a4d096ce8c98c900 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 24 09:18:52 2011 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 24 09:18:52 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoopm.git;a=commit;h=750eff06 |
| 7 |
|
| 8 |
Portage: fix environment.* file sorting. |
| 9 |
|
| 10 |
--- |
| 11 |
gentoopm/basepm/pkg.py | 6 +++--- |
| 12 |
1 files changed, 3 insertions(+), 3 deletions(-) |
| 13 |
|
| 14 |
diff --git a/gentoopm/basepm/pkg.py b/gentoopm/basepm/pkg.py |
| 15 |
index d63d5fc..cbc2362 100644 |
| 16 |
--- a/gentoopm/basepm/pkg.py |
| 17 |
+++ b/gentoopm/basepm/pkg.py |
| 18 |
@@ -287,10 +287,10 @@ class PMPackage(PMAtom, FillMissingComparisons): |
| 19 |
except OSError: |
| 20 |
return -1 |
| 21 |
|
| 22 |
- files = ('environment.bz2', 'environment') |
| 23 |
+ files = [os.path.join(p, fn) for fn |
| 24 |
+ in ('environment.bz2', 'environment')] |
| 25 |
# Take the newer one. |
| 26 |
- fn = sorted(files, key=_mtime_if_exists, reverse=True)[0] |
| 27 |
- p = os.path.join(p, fn) |
| 28 |
+ p = sorted(files, key=_mtime_if_exists, reverse=True)[0] |
| 29 |
|
| 30 |
if not os.path.exists(p): |
| 31 |
return None |
Archives