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

diff --git a/pym/portage.py b/pym/portage.py
index 68483803538504933c577ac63cd115a8fc260b6f..842bc71511675747e6ad830f60800edc89b0a583 100644 (file)
--- 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: