don't list files as being merged when they are ignored due to confmem, bug #212080

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

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 61096658cc257276af214c854d3c7d555c692707..3a692680dc613a4c2baa2fdddafb4ec2e136673a 100644 (file)
--- 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: