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

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

commit:     944d1a9f5986aae3a03587e541aa43e82af105a5
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Thu Apr 25 15:01:14 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Thu Apr 25 15:01:14 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=944d1a9f

overlay/pkgdir: misc, fix for portagemanifest

Changes:
* self._need_manifest is now set by PackageDirBase.write_manifest()
* replaced debug print with debug log statement in PackagDirBase
* portagemanifest: dont fail if metadata.xml does not exist

---
 roverlay/overlay/pkgdir/packagedir_base.py         |   13 +++++++++----
 .../overlay/pkgdir/packagedir_ebuildmanifest.py    |    6 +-----
 .../overlay/pkgdir/packagedir_portagemanifest.py   |   19 +++++++++++++++----
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/roverlay/overlay/pkgdir/packagedir_base.py b/roverlay/overlay/pkgdir/packagedir_base.py
index 3c9b623..95da017 100644
--- a/roverlay/overlay/pkgdir/packagedir_base.py
+++ b/roverlay/overlay/pkgdir/packagedir_base.py
@@ -195,15 +195,16 @@ class PackageDirBase ( object ):
 		try:
 			self._lock.acquire()
 			pvr = package_info ['ebuild_verstr']
-			# FIXME debug print
-			print ( "removing {PVR} from {PN}".format ( PVR=pvr, PN=self.name ) )
+			self.logger.debug (
+				"removing {PVR} from {PN}".format ( PVR=pvr, PN=self.name )
+			)
 			del self._packages [pvr]
 			self.generate_metadata ( skip_if_existent=False )
 		except KeyError:
 			pass
 		finally:
 			self._lock.release()
-	# --- end of uncreateable_ebuild (...) ---
+	# --- end of ebuild_uncreateable (...) ---
 
 	def empty ( self ):
 		"""Returns True if no ebuilds stored, else False.
@@ -637,7 +638,11 @@ class PackageDirBase ( object ):
 
 		if pkgs_for_manifest:
 			self.logger.debug ( "Writing Manifest" )
-			return self._write_manifest ( pkgs_for_manifest )
+			if self._write_manifest ( pkgs_for_manifest ):
+				self._need_manifest = False
+				return True
+			else:
+				return False
 		elif ignore_empty:
 			return True
 		else:

diff --git a/roverlay/overlay/pkgdir/packagedir_ebuildmanifest.py b/roverlay/overlay/pkgdir/packagedir_ebuildmanifest.py
index 5fec14b..0014147 100644
--- a/roverlay/overlay/pkgdir/packagedir_ebuildmanifest.py
+++ b/roverlay/overlay/pkgdir/packagedir_ebuildmanifest.py
@@ -25,9 +25,5 @@ class PackageDir ( packagedir_base.PackageDirBase ):
 		returns: success (True/False)
 		"""
 
-		if manifest.create_manifest ( pkgs_for_manifest, nofail=False ):
-			self._need_manifest = False
-			return True
-		else:
-			return False
+		return manifest.create_manifest ( pkgs_for_manifest, nofail=False )
 	# --- end of write_manifest (...) ---

diff --git a/roverlay/overlay/pkgdir/packagedir_portagemanifest.py b/roverlay/overlay/pkgdir/packagedir_portagemanifest.py
index 9dc2182..588bdc0 100644
--- a/roverlay/overlay/pkgdir/packagedir_portagemanifest.py
+++ b/roverlay/overlay/pkgdir/packagedir_portagemanifest.py
@@ -10,6 +10,7 @@ import os
 import shlex
 
 import portage.manifest
+import portage.exception
 
 import logging
 logging.getLogger ( __name__ ).warning ( "experimental code" )
@@ -109,8 +110,20 @@ class PackageDir ( roverlay.overlay.pkgdir.packagedir_base.PackageDirBase ):
 		)
 
 		# metadata.xml
-		# os.path.basename ( self._metadata.filepath )
-		manifest.addFile ( 'MISC', 'metadata.xml' )
+		#os.path.basename ( self._metadata.filepath )
+		try:
+			manifest.addFile ( 'MISC', 'metadata.xml' )
+		except portage.exception.FileNotFound as f404:
+			# package dir has no metadata.xml file
+			#
+			# This happens for a few package dirs that dont contain any package
+			# with enough information required for metadata creation
+			#
+			# packagedir_ebuildmanifest accepts this case without complaining,
+			# so ignore it here, too.
+			#
+			pass
+
 
 		for p in pkgs_for_manifest:
 
@@ -149,7 +162,5 @@ class PackageDir ( roverlay.overlay.pkgdir.packagedir_base.PackageDirBase ):
 		#manifest.create ( assumeDistHashesSometimes=False )
 
 		manifest.write()
-		self._need_manifest = False
-
 		return True
 	# --- end of write_manifest (...) ---