Do not unmerge fifo files because, since their mtime is not stored in CONTENTS, we...

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

diff --git a/pym/portage.py b/pym/portage.py
index 954af4069186996def119560273f3bf48acb7ffc..c8c1570f842e6f767d5d6a843f284b9e7beba793 100644 (file)
--- 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))