commit: 0c95b6b4aea0b7baa86c6f41e6b643c477f60203 Author: Paul Varner <fuzzyray <AT> gentoo <DOT> org> AuthorDate: Thu Jun 23 20:00:15 2016 +0000 Commit: Paul Varner <fuzzyray <AT> gentoo <DOT> org> CommitDate: Thu Jun 23 20:00:15 2016 +0000 URL: https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=0c95b6b4
eclean: Apply handle binpkgs with .xpak suffix patch from bug 586658 Author: Manuel Mommertz <2kmm <AT> gmx.de> X-Gentoo-bug: 586658 X-Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=586658 pym/gentoolkit/eclean/search.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pym/gentoolkit/eclean/search.py b/pym/gentoolkit/eclean/search.py index f771ffc..7b261b8 100644 --- a/pym/gentoolkit/eclean/search.py +++ b/pym/gentoolkit/eclean/search.py @@ -542,18 +542,22 @@ def findPackages( if root[-3:] == 'All': continue for file in files: - if not file[-5:] == ".tbz2": - # ignore non-tbz2 files + if file[-5:] == ".tbz2": + category = os.path.basename(root) + cpv = category+"/"+file[:-5] + elif file[-5:] == ".xpak": + category = os.path.basename(os.path.dirname(root)) + cpv = category+"/"+file.rpartition('-')[0] + else: + # ignore other files continue path = os.path.join(root, file) - category = os.path.split(root)[-1] - cpv = category+"/"+file[:-5] st = os.lstat(path) if time_limit and (st[stat.ST_MTIME] >= time_limit): # time-limit exclusion continue # dict is cpv->[files] (2 files in general, because of symlink) - clean_me[cpv] = [path] + clean_me.setdefault(cpv,[]).append(path) #if os.path.islink(path): if stat.S_ISLNK(st[stat.ST_MODE]): clean_me[cpv].append(os.path.realpath(path))
