From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 9A47B13838B for ; Mon, 29 Sep 2014 18:29:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 61BBFE07F0; Mon, 29 Sep 2014 18:29:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AEE81E07EB for ; Mon, 29 Sep 2014 18:29:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7ACA93402E3 for ; Mon, 29 Sep 2014 18:29:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 37E16597 for ; Mon, 29 Sep 2014 18:29:28 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1412011220.ff59730867341ce214f1d6d2bff3325aa3bed0c2.dol-sen@gentoo> Subject: [gentoo-commits] proj/portage:plugin-sync commit in: pym/portage/emaint/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/emaint/main.py X-VCS-Directories: pym/portage/emaint/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: ff59730867341ce214f1d6d2bff3325aa3bed0c2 X-VCS-Branch: plugin-sync Date: Mon, 29 Sep 2014 18:29:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 773bc1d8-a236-4ad9-8bd8-c3794958f3e8 X-Archives-Hash: b173f89f884ea2101794caf3195503d5 commit: ff59730867341ce214f1d6d2bff3325aa3bed0c2 Author: Brian Dolbec gentoo org> AuthorDate: Wed Sep 3 23:20:06 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Mon Sep 29 17:20:20 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ff597308 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 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(