From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 21 Jun 2006 01:53:25 +0000 (-0000)
Subject: Do not unmerge fifo files because, since their mtime is not stored in CONTENTS, we... 
X-Git-Tag: v2.1-r1~23
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e8a5e7f403c310625b72d2301ccdf5051330fb9b;p=portage.git

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.  This patch is from trunk r3482.

svn path=/main/branches/2.1/; revision=3556
---

diff --git a/pym/portage.py b/pym/portage.py
index 954af4069..c8c1570f8 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -6078,11 +6078,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))