1 |
Author: zmedico |
2 |
Date: 2008-03-28 11:41:36 +0000 (Fri, 28 Mar 2008) |
3 |
New Revision: 9545 |
4 |
|
5 |
Modified: |
6 |
main/branches/2.1.2/pym/portage.py |
7 |
Log: |
8 |
Bug #212080 - Don't list files as being merged when they are ignored due |
9 |
to confmem. (trunk r9426) |
10 |
|
11 |
|
12 |
Modified: main/branches/2.1.2/pym/portage.py |
13 |
=================================================================== |
14 |
--- main/branches/2.1.2/pym/portage.py 2008-03-28 11:38:34 UTC (rev 9544) |
15 |
+++ main/branches/2.1.2/pym/portage.py 2008-03-28 11:41:36 UTC (rev 9545) |
16 |
@@ -9464,7 +9464,7 @@ |
17 |
moveme = cfgfiledict["IGNORE"] |
18 |
cfgprot = cfgfiledict["IGNORE"] |
19 |
if not moveme: |
20 |
- zing = "-o-" |
21 |
+ zing = "---" |
22 |
mymtime = long(mystat.st_mtime) |
23 |
else: |
24 |
moveme = 1 |
25 |
@@ -9487,8 +9487,7 @@ |
26 |
sys.exit(1) |
27 |
zing=">>>" |
28 |
|
29 |
- if mymtime!=None: |
30 |
- zing=">>>" |
31 |
+ if mymtime != None: |
32 |
outfile.write("obj "+myrealdest+" "+mymd5+" "+str(mymtime)+"\n") |
33 |
writemsg_stdout("%s %s\n" % (zing,mydest)) |
34 |
else: |
35 |
|
36 |
-- |
37 |
gentoo-commits@l.g.o mailing list |