summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Harring <ferringb@gentoo.org>2006-01-09 13:07:34 +0000
committerBrian Harring <ferringb@gentoo.org>2006-01-09 13:07:34 +0000
commit11b22c73ed69a68f9070d85857e66d93c02f9ba4 (patch)
treecb286fe5ade32300ef62eeedc07bda725e50296a
parentc45bb4e3d2d8b243fa0d4ce633e4c6a2700ff58f (diff)
downloadportage-11b22c73ed69a68f9070d85857e66d93c02f9ba4.tar.gz
portage-11b22c73ed69a68f9070d85857e66d93c02f9ba4.tar.bz2
portage-11b22c73ed69a68f9070d85857e66d93c02f9ba4.zip
Always call prerm/postrm regardless if the previous install had contents or not.
svn path=/main/trunk/; revision=2556
-rw-r--r--pym/portage.py11
1 files changed, 5 insertions, 6 deletions
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