From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 028081382C5 for ; Thu, 23 Jun 2016 20:01:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C60919412F; Thu, 23 Jun 2016 20:01:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 636B59412F for ; Thu, 23 Jun 2016 20:01:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C6061340B1E for ; Thu, 23 Jun 2016 20:01:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9FD941933 for ; Thu, 23 Jun 2016 20:01:03 +0000 (UTC) From: "Paul Varner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Paul Varner" Message-ID: <1466712015.0c95b6b4aea0b7baa86c6f41e6b643c477f60203.fuzzyray@gentoo> Subject: [gentoo-commits] proj/gentoolkit:master commit in: pym/gentoolkit/eclean/ X-VCS-Repository: proj/gentoolkit X-VCS-Files: pym/gentoolkit/eclean/search.py X-VCS-Directories: pym/gentoolkit/eclean/ X-VCS-Committer: fuzzyray X-VCS-Committer-Name: Paul Varner X-VCS-Revision: 0c95b6b4aea0b7baa86c6f41e6b643c477f60203 X-VCS-Branch: master Date: Thu, 23 Jun 2016 20:01:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ed340799-258b-466b-a816-9e87af8f6654 X-Archives-Hash: d0c2e498c3fad6b2f4182274817e57ca commit: 0c95b6b4aea0b7baa86c6f41e6b643c477f60203 Author: Paul Varner gentoo org> AuthorDate: Thu Jun 23 20:00:15 2016 +0000 Commit: Paul Varner gentoo 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 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))