[patch] Portage patch to fix some manifest bugs triggered by the preserve script

vdb-preserve.diff (text/plain), 2.58 KB, created by Marius Mauch (RETIRED) on 2007-01-20 16:14:27 UTC

--- portage/pym/portage_const.py	2007-01-18 17:04:01.248589965 +0100
+++ portage/pym/portage_const.py	2007-01-20 14:07:33.678233215 +0100
@@ -57,6 +53,7 @@
 HASHING_BLOCKSIZE        = 32768
 MANIFEST1_HASH_FUNCTIONS = ["MD5","SHA256","RMD160"]
 MANIFEST2_HASH_FUNCTIONS = ["SHA1","SHA256","RMD160"]
+MANIFEST2_REQUIRED_HASH = "SHA1"
 
 MANIFEST2_IDENTIFIERS = ["AUX","MISC","DIST","EBUILD"]
 # ===========================================================================
--- portage/pym/portage_manifest.py	2007-01-03 03:49:20.135397957 +0100
+++ portage/pym/portage_manifest.py	2007-01-20 17:01:47.779573715 +0100
@@ -120,7 +120,10 @@
 		if not from_scratch:
 			self._read()
 		self.compat = manifest1_compat
-		self.fetchlist_dict = fetchlist_dict
+		if fetchlist_dict != None:
+			self.fetchlist_dict = fetchlist_dict
+		else:
+			self.fetchlist_dict = {}
 		self.distdir = distdir
 		self.guessType = guessManifestFileType
 
@@ -381,17 +384,21 @@
 		""" Validate signature on Manifest """
 		raise NotImplementedError()
 	
-	def addFile(self, ftype, fname, hashdict=None):
+	def addFile(self, ftype, fname, hashdict=None, ignoreMissing=False):
 		""" Add entry to Manifest optionally using hashdict to avoid recalculation of hashes """
-		if not os.path.exists(self.pkgdir+fname):
+		if ftype == "AUX" and not fname.startswith("files/"):
+			fname = os.path.join("files", fname)
+		if not os.path.exists(self.pkgdir+fname) and not ignoreMissing:
 			raise FileNotFound(fname)
 		if not ftype in portage_const.MANIFEST2_IDENTIFIERS:
 			raise InvalidDataType(ftype)
+		if ftype == "AUX" and fname.startswith("files"):
+			fname = fname[6:]
 		self.fhashdict[ftype][fname] = {}
 		if hashdict != None:
 			self.fhashdict[ftype][fname].update(hashdict)
 		if not portage_const.MANIFEST2_REQUIRED_HASH in self.fhashdict[ftype][fname]:
-			self.updateFileHashes(ftype, fname)
+			self.updateFileHashes(ftype, fname, checkExisting=False, ignoreMissing=ignoreMissing)
 	
 	def removeFile(self, ftype, fname):
 		""" Remove given entry from Manifest """
@@ -521,10 +528,9 @@
 				self.checkTypeHashes("MISC", ignoreMissingFiles=False)
 			ebuildname = "%s.ebuild" % self._catsplit(cpv)[1]
 			self.checkFileHashes("EBUILD", ebuildname, ignoreMissing=False)
-		if checkDistfiles:
-			if onlyDistfiles:
-				for f in self._getCpvDistfiles(cpv):
-					self.checkFileHashes("DIST", f, ignoreMissing=False)
+		if checkDistfiles or onlyDistfiles:
+			for f in self._getCpvDistfiles(cpv):
+				self.checkFileHashes("DIST", f, ignoreMissing=False)
 	
 	def _getCpvDistfiles(self, cpv):
 		""" Get a list of all DIST files associated to the given cpv """