[gentoo-commits] proj/pms-test-suite:master commit in: PMSTestSuite/repository/

[Michał Górny]

commit:     0a914c67bfd5caca8c3ac32ed468440c42991141
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  1 12:25:59 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun  1 12:25:59 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pms-test-suite.git;a=commit;h=0a914c67

Commonize category grabbing code.

---
 PMSTestSuite/repository/__init__.py |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/PMSTestSuite/repository/__init__.py b/PMSTestSuite/repository/__init__.py
index 60a975d..6545035 100644
--- a/PMSTestSuite/repository/__init__.py
+++ b/PMSTestSuite/repository/__init__.py
@@ -40,16 +40,20 @@ class EbuildRepository(object):
 		if not self.repo_name:
 			raise ValueError('Repository %s has invalid name.' % path)
 
+	def get_category_from_path(self, fn):
+		head = fn
+		while head:
+			head, tail = os.path.split(head)
+		if tail in ('eclass', 'profiles'):
+			return None
+		return tail
+
 	def write_files(self, files):
 		""" Write files from files dict to the repository. """
 		for fn in files:
-			head = fn
-			while head:
-				head, tail = os.path.split(head)
-			if tail in ('eclass', 'profiles'):
-				pass
-			elif tail not in self.categories:
-				self.add_category(tail, files)
+			cat = self.get_category_from_path(fn)
+			if cat and cat not in self.categories:
+				self.add_category(cat, files)
 
 		for fn, c in files.items():
 			fp = os.path.join(self.path, fn)