From c97d73758e38eb418e819e1cdb1c0a5936d2f972 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 4 Oct 2006 07:17:50 +0000 Subject: Properly write all fifo and device nodes to CONTENTS for bug #144781. Code to parse these entries has already in place and they are never unmerged. svn path=/main/trunk/; revision=4588 --- pym/portage.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pym/portage.py b/pym/portage.py index 5e62caa20..a1fb2aef3 100644 --- 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, -- cgit v1.2.3-1-g7c22