From 908367f3c219c13747e55a38fdb0509a4d43dff1 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 28 Mar 2008 11:41:36 +0000 Subject: 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 --- pym/portage.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'pym') 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: -- cgit v1.2.3-1-g7c22