1 |
Author: zmedico |
2 |
Date: 2008-05-27 00:11:47 +0000 (Tue, 27 May 2008) |
3 |
New Revision: 10437 |
4 |
|
5 |
Modified: |
6 |
main/branches/2.1.2/bin/emerge |
7 |
Log: |
8 |
Add some debug output for arguments and their associated atoms, to help in |
9 |
debugging problems similar to bug #223735. (trunk r10436) |
10 |
|
11 |
|
12 |
Modified: main/branches/2.1.2/bin/emerge |
13 |
=================================================================== |
14 |
--- main/branches/2.1.2/bin/emerge 2008-05-27 00:10:12 UTC (rev 10436) |
15 |
+++ main/branches/2.1.2/bin/emerge 2008-05-27 00:11:47 UTC (rev 10437) |
16 |
@@ -2604,6 +2604,7 @@ |
17 |
def select_files(self, myfiles): |
18 |
"""Given a list of .tbz2s, .ebuilds sets, and deps, create the |
19 |
appropriate depgraph and return a favorite list.""" |
20 |
+ debug = "--debug" in self.myopts |
21 |
root_config = self.roots[self.target_root] |
22 |
sets = root_config.sets |
23 |
getSetAtoms = root_config.setconfig.getSetAtoms |
24 |
@@ -2840,6 +2841,8 @@ |
25 |
if arg not in refs: |
26 |
refs.append(arg) |
27 |
pprovideddict = pkgsettings.pprovideddict |
28 |
+ if debug: |
29 |
+ portage.writemsg("\n", noiselevel=-1) |
30 |
# Order needs to be preserved since a feature of --nodeps |
31 |
# is to allow the user to force a specific merge order. |
32 |
args.reverse() |
33 |
@@ -2861,6 +2864,9 @@ |
34 |
"dependencies for %s\n") % arg.arg) |
35 |
return 0, myfavorites |
36 |
continue |
37 |
+ if debug: |
38 |
+ portage.writemsg(" Arg: %s\n Atom: %s\n" % \ |
39 |
+ (arg, atom), noiselevel=-1) |
40 |
pkg, existing_node = self._select_package( |
41 |
myroot, atom, onlydeps=onlydeps) |
42 |
if not pkg: |
43 |
@@ -3300,7 +3306,8 @@ |
44 |
|
45 |
if "--debug" in self.myopts: |
46 |
for pkg in matched_packages: |
47 |
- print (pkg.type_name + ":").rjust(10), pkg.cpv |
48 |
+ portage.writemsg("%s %s\n" % \ |
49 |
+ ((pkg.type_name + ":").rjust(10), pkg.cpv), noiselevel=-1) |
50 |
|
51 |
# Filter out any old-style virtual matches if they are |
52 |
# mixed with new-style virtual matches. |
53 |
|
54 |
-- |
55 |
gentoo-commits@l.g.o mailing list |