| 1 |
commit: ff59730867341ce214f1d6d2bff3325aa3bed0c2 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 3 23:20:06 2014 +0000 |
| 4 |
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
| 5 |
CommitDate: Mon Sep 29 17:20:20 2014 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ff597308 |
| 7 |
|
| 8 |
emaint/main.py: Change func to long_action for module action check |
| 9 |
|
| 10 |
Due to the change making it possible for the --action to be different than the actual function |
| 11 |
beign called. func no longer was the same as the avalable actions listed. |
| 12 |
Reverts the change made in: |
| 13 |
Commit: e166eb68e838389505f15426a2f0011dd95be342 |
| 14 |
Author: Brian Dolbec <dolsen <AT> gentoo.org> (Wed 12 Mar 2014 08:40:49 PM PDT) |
| 15 |
Subject: portage/emaint/main.py: Fix a bug in the options parsing. |
| 16 |
|
| 17 |
--- |
| 18 |
pym/portage/emaint/main.py | 6 +++--- |
| 19 |
1 file changed, 3 insertions(+), 3 deletions(-) |
| 20 |
|
| 21 |
diff --git a/pym/portage/emaint/main.py b/pym/portage/emaint/main.py |
| 22 |
index f76cee2..6292338 100644 |
| 23 |
--- a/pym/portage/emaint/main.py |
| 24 |
+++ b/pym/portage/emaint/main.py |
| 25 |
@@ -113,7 +113,7 @@ class TaskHandler(object): |
| 26 |
for task in tasks: |
| 27 |
inst = task() |
| 28 |
show_progress = self.show_progress_bar and self.isatty |
| 29 |
- # check if the function is capable of progressbar |
| 30 |
+ # check if the function is capable of progressbar |
| 31 |
# and possibly override it off |
| 32 |
if show_progress and hasattr(inst, 'can_progressbar'): |
| 33 |
show_progress = inst.can_progressbar(func) |
| 34 |
@@ -206,9 +206,9 @@ def emaint_main(myargv): |
| 35 |
tasks = [] |
| 36 |
for m in module_names[1:]: |
| 37 |
#print("DEBUG: module: %s, functions: " % (m, str(module_controller.get_functions(m)))) |
| 38 |
- if func in module_controller.get_functions(m): |
| 39 |
+ if long_action in module_controller.get_functions(m): |
| 40 |
tasks.append(module_controller.get_class(m)) |
| 41 |
- elif func in module_controller.get_functions(args[0]): |
| 42 |
+ elif long_action in module_controller.get_functions(args[0]): |
| 43 |
tasks = [module_controller.get_class(args[0] )] |
| 44 |
else: |
| 45 |
portage.util.writemsg( |
Archives