From: Brian Harring <ferringb@gentoo.org>
Date: Mon, 9 Jan 2006 13:07:34 +0000 (-0000)
Subject: Always call prerm/postrm regardless if the previous install had contents or not.
X-Git-Tag: v2.1_pre4~36
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=11b22c73ed69a68f9070d85857e66d93c02f9ba4;p=portage.git

Always call prerm/postrm regardless if the previous install had contents or not.

svn path=/main/trunk/; revision=2556
---

diff --git a/pym/portage.py b/pym/portage.py
index 692d52c33..0bf16c6be 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -6058,12 +6058,11 @@ class dblink:
 		outfile.flush()
 		outfile.close()
 
-		if (oldcontents):
-			writemsg_stdout(">>> Safely unmerging already-installed instance...\n")
-			self.dbdir = self.dbpkgdir
-			self.unmerge(oldcontents,trimworld=0)
-			self.dbdir = self.dbtmpdir
-			writemsg_stdout(">>> original instance of package unmerged safely.\n")
+		writemsg_stdout(">>> Safely unmerging already-installed instance...\n")
+		self.dbdir = self.dbpkgdir
+		self.unmerge(oldcontents,trimworld=0)
+		self.dbdir = self.dbtmpdir
+		writemsg_stdout(">>> original instance of package unmerged safely.\n")
 
 		# We hold both directory locks.
 		self.dbdir = self.dbpkgdir