[gentoo-commits] proj/gentoolkit:gentoolkit commit in: pym/gentoolkit/revdep_rebuild/

[Brian Dolbec]

commit:     602246c01709980ada3036cc995e74f6e06c90ef
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  4 07:40:54 2012 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Sun Mar  4 07:40:54 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoolkit.git;a=commit;h=602246c0

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/revdep_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
 
+# ignore these files or directories if found
+IGNORED = ['.cache', 'world', 'world~', 'world.bak']
 
 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 = 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 db: ") +
 					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 = settings['PKG_DIR'] + group + '/' + pkg + '/CONTENTS'
 			if os.path.exists(_file):
 				try: