From 9849e2fa53d8884fccf7a4461e71141317b4dbe0 Mon Sep 17 00:00:00 2001 From: Marius Mauch Date: Mon, 3 Mar 2008 20:28:22 +0000 Subject: don't list files as being merged when they are ignored due to confmem, bug #212080 svn path=/main/trunk/; revision=9426 --- pym/portage/dbapi/vartree.py | 3 +-- 1 file changed, 1 insertion(+), 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: -- cgit v1.2.3-1-g7c22