summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius Mauch <genone@gentoo.org>2008-03-03 20:28:22 +0000
committerMarius Mauch <genone@gentoo.org>2008-03-03 20:28:22 +0000
commit9849e2fa53d8884fccf7a4461e71141317b4dbe0 (patch)
tree9da021b3a805df04a9305ffdde2f0cbc2ddb61ad
parent9c7530830a39e04c3cab3763163d2bb946b672a5 (diff)
downloadportage-9849e2fa53d8884fccf7a4461e71141317b4dbe0.tar.gz
portage-9849e2fa53d8884fccf7a4461e71141317b4dbe0.tar.bz2
portage-9849e2fa53d8884fccf7a4461e71141317b4dbe0.zip
don't list files as being merged when they are ignored due to confmem, bug #212080
svn path=/main/trunk/; revision=9426
-rw-r--r--pym/portage/dbapi/vartree.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 61096658c..3a692680d 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -2417,7 +2417,7 @@ class dblink(object):
moveme = cfgfiledict["IGNORE"]
cfgprot = cfgfiledict["IGNORE"]
if not moveme:
- zing = "-o-"
+ zing = "---"
mymtime = long(mystat.st_mtime)
else:
moveme = 1
@@ -2441,7 +2441,6 @@ class dblink(object):
zing = ">>>"
if mymtime != None:
- zing = ">>>"
outfile.write("obj "+myrealdest+" "+mymd5+" "+str(mymtime)+"\n")
writemsg_stdout("%s %s\n" % (zing,mydest))
else: