Properly write all fifo and device nodes to CONTENTS for bug #144781. Code to parse...

svn path=/main/trunk/; revision=4588

diff --git a/pym/portage.py b/pym/portage.py
index 5e62caa2001dbdbf6e8494cd49843af242e01c38..a1fb2aef3e03078ea0b8bcea4d57ce1e1ff99e0f 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -6521,12 +6521,12 @@ class dblink:
                                        # destination doesn't exist
                                        if movefile(mysrc,mydest,newmtime=thismtime,sstat=mystat, mysettings=self.settings)!=None:
                                                zing=">>>"
-                                               if stat.S_ISFIFO(mymode):
-                                                       # we don't record device nodes in CONTENTS,
-                                                       # although we do merge them.
-                                                       outfile.write("fif "+myrealdest+"\n")
                                        else:
                                                sys.exit(1)
+                               if stat.S_ISFIFO(mymode):
+                                       outfile.write("fif %s\n" % myrealdest)
+                               else:
+                                       outfile.write("dev %s\n" % myrealdest)
                                writemsg_stdout(zing+" "+mydest+"\n")
 
        def merge(self, mergeroot, inforoot, myroot, myebuild=None, cleanup=0,