summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-06-10 05:06:35 +0000
committerZac Medico <zmedico@gentoo.org>2006-06-10 05:06:35 +0000
commit3c411aa4159cd7c2c25b0f74be5951b6e69f2a80 (patch)
tree0249e6d8a166a55718ca1e576209545b71ca886a
parent175050ec186316d861112279c09062e671db4b9c (diff)
downloadportage-3c411aa4159cd7c2c25b0f74be5951b6e69f2a80.tar.gz
portage-3c411aa4159cd7c2c25b0f74be5951b6e69f2a80.tar.bz2
portage-3c411aa4159cd7c2c25b0f74be5951b6e69f2a80.zip
Do not unmerge fifo files because, since their mtime is not stored in CONTENTS, we can't be sure if they belong to another package unless we search through all CONTENTS for all installed packages. See bug #136199.
svn path=/main/trunk/; revision=3482
-rw-r--r--pym/portage.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/pym/portage.py b/pym/portage.py
index e51f2ee15..ffeed06a1 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -6066,11 +6066,7 @@ class dblink:
if not stat.S_ISFIFO(lstatobj[stat.ST_MODE]):
writemsg_stdout("--- !fif %s %s\n" % ("fif", obj))
continue
- try:
- os.unlink(obj)
- except (OSError,IOError),e:
- pass
- writemsg_stdout("<<< %s %s\n" % ("fif",obj))
+ writemsg_stdout("--- %s %s\n" % ("fif",obj))
elif pkgfiles[objkey][0]=="dev":
writemsg_stdout("--- %s %s\n" % ("dev",obj))