diff options
| author | Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> | 2012-10-14 22:00:19 +0200 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> | 2012-10-14 22:00:19 +0200 |
| commit | e7f0157b952a5eb9d77464d40b27748c226f580b (patch) | |
| tree | 1e9675c0c8c218b8425b454e3ae276ce63750323 /pym/_emerge/resolver/output.py | |
| parent | 86385b9747e6cd4a23bd01eb7b8628fd3e158f76 (diff) | |
| download | portage-e7f0157b952a5eb9d77464d40b27748c226f580b.tar.gz portage-e7f0157b952a5eb9d77464d40b27748c226f580b.tar.bz2 portage-e7f0157b952a5eb9d77464d40b27748c226f580b.zip | |
Invert order of arguments in Display._set_non_root_columns() and
Display._set_root_columns() for consistency with Display._set_no_columns().
Diffstat (limited to 'pym/_emerge/resolver/output.py')
| -rw-r--r-- | pym/_emerge/resolver/output.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py index 92c9b4aa5..5b297efde 100644 --- a/pym/_emerge/resolver/output.py +++ b/pym/_emerge/resolver/output.py @@ -389,11 +389,11 @@ class Display(object): myoldbest_str = blue("["+", ".join(versions)+"]") return myoldbest_str - def _set_non_root_columns(self, pkg_info, pkg): + def _set_non_root_columns(self, pkg, pkg_info): """sets the indent level and formats the output - @param pkg_info: dictionary @param pkg: _emerge.Package.Package instance + @param pkg_info: dictionary @rtype string """ ver_str = pkg_info.ver @@ -427,11 +427,11 @@ class Display(object): return myprint - def _set_root_columns(self, pkg_info, pkg): + def _set_root_columns(self, pkg, pkg_info): """sets the indent level and formats the output - @param pkg_info: dictionary @param pkg: _emerge.Package.Package instance + @param pkg_info: dictionary @rtype string Modifies self.verboseadd """ @@ -822,7 +822,7 @@ class Display(object): if pkg_info.oldbest: pkg_info.oldbest += " " if self.conf.columns: - myprint = self._set_non_root_columns(pkg_info, pkg) + myprint = self._set_non_root_columns(pkg, pkg_info) else: pkg_str = pkg.cpv if self.conf.verbosity == 3 and not self.quiet_repo_display and (self.verbose_main_repo_display or @@ -843,7 +843,7 @@ class Display(object): pkg_info.oldbest + darkgreen("to " + pkg.root) else: if self.conf.columns: - myprint = self._set_root_columns(pkg_info, pkg) + myprint = self._set_root_columns(pkg, pkg_info) else: myprint = self._set_no_columns(pkg, pkg_info) |