diff options
author | Zac Medico <zmedico@gentoo.org> | 2008-05-27 00:10:12 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2008-05-27 00:10:12 +0000 |
commit | 20f99522ed450be5c5d6b2e65395283ad389d6db (patch) | |
tree | c44d42ee70fa1c3188209bb10c15ba1a98c42b93 | |
parent | 1a476ed1c00203b4ac613b85b79fa5b3e41a0ea9 (diff) | |
download | portage-20f99522ed450be5c5d6b2e65395283ad389d6db.tar.gz portage-20f99522ed450be5c5d6b2e65395283ad389d6db.tar.bz2 portage-20f99522ed450be5c5d6b2e65395283ad389d6db.zip |
Add some debug output for arguments and their associated atoms, to help in
debugging problems similar to bug #223735.
svn path=/main/trunk/; revision=10436
-rw-r--r-- | pym/_emerge/__init__.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index b045b02f1..9ec78c053 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -2471,6 +2471,7 @@ class depgraph(object): def select_files(self, myfiles): """Given a list of .tbz2s, .ebuilds sets, and deps, create the appropriate depgraph and return a favorite list.""" + debug = "--debug" in self.myopts root_config = self.roots[self.target_root] sets = root_config.sets getSetAtoms = root_config.setconfig.getSetAtoms @@ -2697,6 +2698,8 @@ class depgraph(object): if arg not in refs: refs.append(arg) pprovideddict = pkgsettings.pprovideddict + if debug: + portage.writemsg("\n", noiselevel=-1) # Order needs to be preserved since a feature of --nodeps # is to allow the user to force a specific merge order. args.reverse() @@ -2718,6 +2721,9 @@ class depgraph(object): "dependencies for %s\n") % arg.arg) return 0, myfavorites continue + if debug: + portage.writemsg(" Arg: %s\n Atom: %s\n" % \ + (arg, atom), noiselevel=-1) pkg, existing_node = self._select_package( myroot, atom, onlydeps=onlydeps) if not pkg: @@ -3215,7 +3221,8 @@ class depgraph(object): if "--debug" in self.myopts: for pkg in matched_packages: - print (pkg.type_name + ":").rjust(10), pkg.cpv + portage.writemsg("%s %s\n" % \ + ((pkg.type_name + ":").rjust(10), pkg.cpv), noiselevel=-1) # Filter out any old-style virtual matches if they are # mixed with new-style virtual matches. |