diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-10-04 07:17:50 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-10-04 07:17:50 +0000 |
| commit | c97d73758e38eb418e819e1cdb1c0a5936d2f972 (patch) | |
| tree | 6f8910ffdf57f5643d23fa2a0fe5a1fd1db584da | |
| parent | be71f5d21d5b25a3a62793cacd0d86167179902c (diff) | |
| download | portage-c97d73758e38eb418e819e1cdb1c0a5936d2f972.tar.gz portage-c97d73758e38eb418e819e1cdb1c0a5936d2f972.tar.bz2 portage-c97d73758e38eb418e819e1cdb1c0a5936d2f972.zip | |
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
| -rw-r--r-- | pym/portage.py | 8 |
1 files 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, |