thicken-manifests: another tweak from dwfreed.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>

1 files changed, 8 insertions, 2 deletions

diff --git a/thicken-manifests.py b/thicken-manifests.py
index 070f00b..014a2ee 100755
--- a/thicken-manifests.py
+++ b/thicken-manifests.py
@@ -115,18 +115,24 @@ def maybe_thicken_manifest(pkg_dir):
 			pass
 
 	fetchlistdict = portage.FetchlistDict(pkg_dir, portage_settings, portage_portdbapi)
-	manifest = portage.manifest.Manifest(pkg_dir, fetchlist_dict=fetchlistdict, distdir=portage_settings['DISTDIR'])
+	# We use an empty dir so that we do not introduce any changes to
+	# existing DIST entries, or inject DIST entries that were otherwise
+	# missing.
+	manifest = portage.manifest.Manifest(pkg_dir, fetchlist_dict=fetchlistdict, distdir='/var/empty')
 	try:
 		manifest.create(assumeDistHashesAlways=True)
 	except portage.exception.FileNotFound:
 		logger.exception("%s is missing DIST entries!", pkg_dir)
+		# If any exception was triggered on the Manifest, it is NOT safe to write.
+		return
+	# If it changed, write it out
 	if manifest.write():
 		if args.sign:
 			try:
 				gpg_sign(manifest.getFullname())
 			except:
 				logger.exception("%s Exception thrown during GPG signing", pkg_dir)
-        # Always reset mtime on manifest
+	# Always reset mtime on manifest
 	os.utime(manifest.getFullname(), (newest_mtime, newest_mtime))