From e7f0157b952a5eb9d77464d40b27748c226f580b Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Sun, 14 Oct 2012 22:00:19 +0200 Subject: Invert order of arguments in Display._set_non_root_columns() and Display._set_root_columns() for consistency with Display._set_no_columns(). --- pym/_emerge/resolver/output.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'pym') 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) -- cgit v1.2.3-1-g7c22