[gentoo-commits] proj/R_overlay:master commit in: roverlay/overlay/

["André Erdmann" <dywi@mailerd.de>]

commit:     91736d8f9c07b1d64c42b6ddb0ab6b7da80ceb99
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Aug  1 12:17:02 2012 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Aug  1 12:17:02 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=91736d8f

actually skip manifest creation with --no-manifest

---
 roverlay/overlay/category.py |   13 +++++++------
 roverlay/overlay/root.py     |   12 ++++++------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/roverlay/overlay/category.py b/roverlay/overlay/category.py
index 6623446..3551b81 100644
--- a/roverlay/overlay/category.py
+++ b/roverlay/overlay/category.py
@@ -137,7 +137,7 @@ class Category ( object ):
 		overwrite_ebuilds,
 		keep_n_ebuilds,
 		cautious,
-		skip_manifest=False
+		write_manifest
 	):
 		"""Writes this category to its filesystem location.
 
@@ -205,14 +205,15 @@ class Category ( object ):
 
 			# write manifest files
 			# fixme: debug print
-			#self.logger.info ( "Writing Manifest files for {}".format ( name ) )
-			print ( "Writing Manifest files ..." )
-			for package in self._subdirs.values():
-				package.write_manifest ( ignore_empty=True )
+			if write_manifest:
+				#self.logger.info ( "Writing Manifest files for {}".format ( name ) )
+				print ( "Writing Manifest files ..." )
+				for package in self._subdirs.values():
+					package.write_manifest ( ignore_empty=True )
 
 		else:
 			for package in self._subdirs.values():
-				package.write ( **write_kwargs )
+				package.write ( write_manifest=write_manifest, **write_kwargs )
 
 			self.remove_empty()
 	# --- end of write (...) ---

diff --git a/roverlay/overlay/root.py b/roverlay/overlay/root.py
index 53babdf..3efdf66 100644
--- a/roverlay/overlay/root.py
+++ b/roverlay/overlay/root.py
@@ -330,10 +330,10 @@ class Overlay ( object ):
 
 			for cat in self._categories.values():
 				cat.write (
-					overwrite_ebuilds=False,
-					keep_n_ebuilds=config.get ( 'OVERLAY.keep_nth_latest', None ),
-					cautious=True,
-					skip_manifest=self.skip_manifest
+					overwrite_ebuilds = False,
+					keep_n_ebuilds    = config.get ( 'OVERLAY.keep_nth_latest', None ),
+					cautious          = True,
+					write_manifest    = not self.skip_manifest
 				)
 		else:
 			# FIXME debug print
@@ -353,11 +353,11 @@ class Overlay ( object ):
 
 		returns: None (implicit)
 		"""
-		if self._writeable:
+		if self._writeable and not self.skip_manifest:
 			# FIXME: it would be good to ensure that profiles/categories exist
 			for cat in self._categories.values():
 				cat.write_manifest ( **manifest_kw )
-		else:
+		elif not self.skip_manifest:
 			# FIXME debug print
 			print (
 				"Dropped write_manifest request for readonly overlay {}!".format (