| 1 |
commit: 393277e856e17170f826dd5ddb8a4e475969cfc9 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Dec 2 01:21:45 2013 +0000 |
| 4 |
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
| 5 |
CommitDate: Mon Dec 2 01:22:22 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=393277e8 |
| 7 |
|
| 8 |
whitespace cleanup. |
| 9 |
|
| 10 |
--- |
| 11 |
pym/_emerge/depgraph.py | 26 +++++++++++++------------- |
| 12 |
1 file changed, 13 insertions(+), 13 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
| 15 |
index 65b87d6..cd68db6 100644 |
| 16 |
--- a/pym/_emerge/depgraph.py |
| 17 |
+++ b/pym/_emerge/depgraph.py |
| 18 |
@@ -511,7 +511,7 @@ class _dynamic_depgraph_config(object): |
| 19 |
class depgraph(object): |
| 20 |
|
| 21 |
pkg_tree_map = RootConfig.pkg_tree_map |
| 22 |
- |
| 23 |
+ |
| 24 |
def __init__(self, settings, trees, myopts, myparams, spinner, |
| 25 |
frozen_config=None, backtrack_parameters=BacktrackParameter(), allow_backtracking=False): |
| 26 |
if frozen_config is None: |
| 27 |
@@ -927,7 +927,7 @@ class depgraph(object): |
| 28 |
|
| 29 |
conflict = handler.get_conflict() |
| 30 |
writemsg(conflict, noiselevel=-1) |
| 31 |
- |
| 32 |
+ |
| 33 |
explanation = handler.get_explanation() |
| 34 |
if explanation: |
| 35 |
writemsg(explanation, noiselevel=-1) |
| 36 |
@@ -2618,7 +2618,7 @@ class depgraph(object): |
| 37 |
def _queue_disjunctive_deps(self, pkg, dep_root, dep_priority, dep_struct): |
| 38 |
""" |
| 39 |
Queue disjunctive (virtual and ||) deps in self._dynamic_config._dep_disjunctive_stack. |
| 40 |
- Yields non-disjunctive deps. Raises InvalidDependString when |
| 41 |
+ Yields non-disjunctive deps. Raises InvalidDependString when |
| 42 |
necessary. |
| 43 |
""" |
| 44 |
for x in dep_struct: |
| 45 |
@@ -2742,7 +2742,7 @@ class depgraph(object): |
| 46 |
|
| 47 |
def _select_files(self, myfiles): |
| 48 |
"""Given a list of .tbz2s, .ebuilds sets, and deps, populate |
| 49 |
- self._dynamic_config._initial_arg_list and call self._resolve to create the |
| 50 |
+ self._dynamic_config._initial_arg_list and call self._resolve to create the |
| 51 |
appropriate depgraph and return a favorite list.""" |
| 52 |
self._load_vdb() |
| 53 |
debug = "--debug" in self._frozen_config.myopts |
| 54 |
@@ -3070,7 +3070,7 @@ class depgraph(object): |
| 55 |
# Order needs to be preserved since a feature of --nodeps |
| 56 |
# is to allow the user to force a specific merge order. |
| 57 |
self._dynamic_config._initial_arg_list = args[:] |
| 58 |
- |
| 59 |
+ |
| 60 |
return self._resolve(myfavorites) |
| 61 |
|
| 62 |
def _gen_reinstall_sets(self): |
| 63 |
@@ -3100,8 +3100,8 @@ class depgraph(object): |
| 64 |
root_config=self._frozen_config.roots[root]) |
| 65 |
|
| 66 |
def _resolve(self, myfavorites): |
| 67 |
- """Given self._dynamic_config._initial_arg_list, pull in the root nodes, |
| 68 |
- call self._creategraph to process theier deps and return |
| 69 |
+ """Given self._dynamic_config._initial_arg_list, pull in the root nodes, |
| 70 |
+ call self._creategraph to process theier deps and return |
| 71 |
a favorite list.""" |
| 72 |
debug = "--debug" in self._frozen_config.myopts |
| 73 |
onlydeps = "--onlydeps" in self._frozen_config.myopts |
| 74 |
@@ -4817,7 +4817,7 @@ class depgraph(object): |
| 75 |
# Ignore USE deps for the initial match since we want to |
| 76 |
# ensure that updates aren't missed solely due to the user's |
| 77 |
# USE configuration. |
| 78 |
- for pkg in self._iter_match_pkgs(root_config, pkg_type, atom.without_use, |
| 79 |
+ for pkg in self._iter_match_pkgs(root_config, pkg_type, atom.without_use, |
| 80 |
onlydeps=onlydeps): |
| 81 |
if pkg.cp != atom_cp and have_new_virt: |
| 82 |
# pull in a new-style virtual instead |
| 83 |
@@ -5444,7 +5444,7 @@ class depgraph(object): |
| 84 |
return 0 |
| 85 |
return 1 |
| 86 |
|
| 87 |
- def _pkg(self, cpv, type_name, root_config, installed=False, |
| 88 |
+ def _pkg(self, cpv, type_name, root_config, installed=False, |
| 89 |
onlydeps=False, myrepo = None): |
| 90 |
""" |
| 91 |
Get a package instance from the cache, or create a new |
| 92 |
@@ -5672,7 +5672,7 @@ class depgraph(object): |
| 93 |
myroot = blocker.root |
| 94 |
initial_db = self._frozen_config.trees[myroot]["vartree"].dbapi |
| 95 |
final_db = self._dynamic_config.mydbapi[myroot] |
| 96 |
- |
| 97 |
+ |
| 98 |
provider_virtual = False |
| 99 |
if blocker.cp in virtuals and \ |
| 100 |
not self._have_new_virt(blocker.root, blocker.cp): |
| 101 |
@@ -7818,7 +7818,7 @@ class depgraph(object): |
| 102 |
|
| 103 |
def get_backtrack_infos(self): |
| 104 |
return self._dynamic_config._backtrack_infos |
| 105 |
- |
| 106 |
+ |
| 107 |
|
| 108 |
class _dep_check_composite_db(dbapi): |
| 109 |
""" |
| 110 |
@@ -8027,14 +8027,14 @@ def _spinner_stop(spinner): |
| 111 |
|
| 112 |
portage.writemsg_stdout("... done!\n") |
| 113 |
|
| 114 |
-def backtrack_depgraph(settings, trees, myopts, myparams, |
| 115 |
+def backtrack_depgraph(settings, trees, myopts, myparams, |
| 116 |
myaction, myfiles, spinner): |
| 117 |
""" |
| 118 |
Raises PackageSetNotFound if myfiles contains a missing package set. |
| 119 |
""" |
| 120 |
_spinner_start(spinner, myopts) |
| 121 |
try: |
| 122 |
- return _backtrack_depgraph(settings, trees, myopts, myparams, |
| 123 |
+ return _backtrack_depgraph(settings, trees, myopts, myparams, |
| 124 |
myaction, myfiles, spinner) |
| 125 |
finally: |
| 126 |
_spinner_stop(spinner) |
Archives