commit: 390467b473b6f4e0e01abd8955ebcb5e4dfc6c11
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 3 23:20:06 2014 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Fri Sep 5 20:26:12 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=390467b4
emaint/main.py: Change func to long_action for module action check
Due to the change making it possible for the --action to be different than the
actual function
beign called. func no longer was the same as the avalable actions listed.
Reverts the change made in:
Commit: e166eb68e838389505f15426a2f0011dd95be342
Author: Brian Dolbec <dolsen <AT> gentoo.org> (Wed 12 Mar 2014 08:40:49 PM PDT)
Subject: portage/emaint/main.py: Fix a bug in the options parsing.
---
pym/portage/emaint/main.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pym/portage/emaint/main.py b/pym/portage/emaint/main.py
index f76cee2..6292338 100644
--- a/pym/portage/emaint/main.py
+++ b/pym/portage/emaint/main.py
@@ -113,7 +113,7 @@ class TaskHandler(object):
for task in tasks:
inst = task()
show_progress = self.show_progress_bar and self.isatty
- # check if the function is capable of progressbar
+ # check if the function is capable of progressbar
# and possibly override it off
if show_progress and hasattr(inst, 'can_progressbar'):
show_progress = inst.can_progressbar(func)
@@ -206,9 +206,9 @@ def emaint_main(myargv):
tasks = []
for m in module_names[1:]:
#print("DEBUG: module: %s, functions: " % (m,
str(module_controller.get_functions(m))))
- if func in module_controller.get_functions(m):
+ if long_action in module_controller.get_functions(m):
tasks.append(module_controller.get_class(m))
- elif func in module_controller.get_functions(args[0]):
+ elif long_action in module_controller.get_functions(args[0]):
tasks = [module_controller.get_class(args[0] )]
else:
portage.util.writemsg(
