From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 28 Mar 2008 11:41:36 +0000 (-0000)
Subject: Bug #212080 - Don't list files as being merged when they are ignored due
X-Git-Tag: v2.1.5~345
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=908367f3c219c13747e55a38fdb0509a4d43dff1;p=portage.git

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 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: