diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-03-28 11:41:36 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-03-28 11:41:36 +0000 |
| commit | 908367f3c219c13747e55a38fdb0509a4d43dff1 (patch) | |
| tree | 3b74e54771d0e5ead9feeeb23801706fa561d2cf /pym | |
| parent | 75987f3f90a4e59a8608d5273c0ee79c6732ab16 (diff) | |
| download | portage-908367f3c219c13747e55a38fdb0509a4d43dff1.tar.gz portage-908367f3c219c13747e55a38fdb0509a4d43dff1.tar.bz2 portage-908367f3c219c13747e55a38fdb0509a4d43dff1.zip | |
Bug #212080 - Don't list files as being merged when they are ignored due
to confmem. (trunk r9426)
svn path=/main/branches/2.1.2/; revision=9545
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pym/portage.py b/pym/portage.py index 684838035..842bc7151 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -9464,7 +9464,7 @@ class dblink: moveme = cfgfiledict["IGNORE"] cfgprot = cfgfiledict["IGNORE"] if not moveme: - zing = "-o-" + zing = "---" mymtime = long(mystat.st_mtime) else: moveme = 1 @@ -9487,8 +9487,7 @@ class dblink: sys.exit(1) zing=">>>" - if mymtime!=None: - zing=">>>" + if mymtime != None: outfile.write("obj "+myrealdest+" "+mymd5+" "+str(mymtime)+"\n") writemsg_stdout("%s %s\n" % (zing,mydest)) else: |