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

[Michał Górny]

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

Update files dict in add_category() instead of spawning a new write.

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

diff --git a/PMSTestSuite/repository/__init__.py b/PMSTestSuite/repository/__init__.py
index 70f3727..9af204a 100644
--- a/PMSTestSuite/repository/__init__.py
+++ b/PMSTestSuite/repository/__init__.py
@@ -49,7 +49,7 @@ class EbuildRepository(object):
 			if tail in ('eclass', 'profiles'):
 				pass
 			elif tail not in self.categories:
-				self.add_category(tail)
+				self.add_category(tail, files)
 
 			fp = os.path.join(self.path, fn)
 			if not os.path.exists(os.path.dirname(fp)):
@@ -63,8 +63,11 @@ class EbuildRepository(object):
 		dirs = frozenset([os.path.join(self.path, os.path.dirname(f)) for f in files])
 		pm.remanifest(dirs)
 
-	def add_category(self, catname):
-		""" Add category <catname> to profiles/categories. """
+	def add_category(self, catname, files):
+		"""
+		Add category <catname> to profiles/categories. Update
+		the profiles/categories file in <files> dict.
+		"""
 		raise ValueError("The repository doesn't support %s category." % catname)
 		
 class NewEbuildRepository(EbuildRepository):
@@ -87,11 +90,10 @@ class NewEbuildRepository(EbuildRepository):
 		f.close()
 
 		EbuildRepository.__init__(self, path)
-		
-	def add_category(self, catname):
+
+	def add_category(self, catname, files):
+		# XXX: profiles/categories can contain new categories already
+		# and they may not be in self.categories
 		self.categories.append(catname)
 		newcats = '\n'.join(self.categories)
-		files = {
-			os.path.join('profiles', 'categories'): newcats
-		}
-		self.write_files(files)
+		files[os.path.join('profiles', 'categories')] = newcats