From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1S464b-0003Yx-Mz for garchives@archives.gentoo.org; Sun, 04 Mar 2012 07:41:41 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A5DECE0616; Sun, 4 Mar 2012 07:41:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 6EF1EE0616 for ; Sun, 4 Mar 2012 07:41:34 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AC75E1B400A for ; Sun, 4 Mar 2012 07:41:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id A5472E5401 for ; Sun, 4 Mar 2012 07:41:31 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1330846854.602246c01709980ada3036cc995e74f6e06c90ef.dol-sen@gentoo> Subject: [gentoo-commits] proj/gentoolkit:gentoolkit commit in: pym/gentoolkit/revdep_rebuild/ X-VCS-Repository: proj/gentoolkit X-VCS-Files: pym/gentoolkit/revdep_rebuild/assign.py X-VCS-Directories: pym/gentoolkit/revdep_rebuild/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 602246c01709980ada3036cc995e74f6e06c90ef X-VCS-Branch: gentoolkit Date: Sun, 4 Mar 2012 07:41:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 58de777e-4368-4130-8fd3-1e4ffd708a97 X-Archives-Hash: fd13004b605ccde2c90f8cebff5501d4 commit: 602246c01709980ada3036cc995e74f6e06c90ef Author: Brian Dolbec gentoo org> AuthorDate: Sun Mar 4 07:40:54 2012 +0000 Commit: Brian Dolbec gmail com> CommitDate: Sun Mar 4 07:40:54 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoolkit.gi= t;a=3Dcommit;h=3D602246c0 Add ignored files/directories check. Add a warning for incomplete pkg merges with -MERGING- in the name. --- pym/gentoolkit/revdep_rebuild/assign.py | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/pym/gentoolkit/revdep_rebuild/assign.py b/pym/gentoolkit/rev= dep_rebuild/assign.py index 73f20a9..76b41fc 100644 --- a/pym/gentoolkit/revdep_rebuild/assign.py +++ b/pym/gentoolkit/revdep_rebuild/assign.py @@ -14,6 +14,8 @@ from portage.versions import catpkgsplit from portage import portdb from portage.output import bold, red, yellow =20 +# ignore these files or directories if found +IGNORED =3D ['.cache', 'world', 'world~', 'world.bak'] =20 def assign_packages(broken, logger, settings): ''' Finds and returns packages that owns files placed in broken. @@ -21,12 +23,18 @@ def assign_packages(broken, logger, settings): ''' assigned =3D set() for group in os.listdir(settings['PKG_DIR']): - if os.path.isfile(settings['PKG_DIR'] + group): + if group in IGNORED: + continue + elif os.path.isfile(settings['PKG_DIR'] + group): if not group.startswith('.keep_'): logger.warn(yellow(" * Invalid category found in the installed pkg d= b: ") + bold(settings['PKG_DIR'] + group)) continue for pkg in os.listdir(settings['PKG_DIR'] + group): + if '-MERGING-' in pkg: + logger.warn(yellow(" * Invalid/incomplete package merge found in the= installed pkg db: ") + + bold(settings['PKG_DIR'] + pkg)) + continue _file =3D settings['PKG_DIR'] + group + '/' + pkg + '/CONTENTS' if os.path.exists(_file): try: