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 692d52c33c4c56216f960678cb29ba7d950ede31..0bf16c6be3d63bb9036c7db39051dcf92443af95 100644 (file)
--- 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