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 7436B198005 for ; Thu, 28 Feb 2013 00:25:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 17098E090A; Thu, 28 Feb 2013 00:25:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9C4C7E090A for ; Thu, 28 Feb 2013 00:25:09 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5569233DC5C for ; Thu, 28 Feb 2013 00:25:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id DC775E42C6 for ; Thu, 28 Feb 2013 00:25:06 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1362011094.3507aa783cdf93fd28a58fb32df2fe7e03c46330.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/resolver/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/resolver/output.py X-VCS-Directories: pym/_emerge/resolver/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 3507aa783cdf93fd28a58fb32df2fe7e03c46330 X-VCS-Branch: master Date: Thu, 28 Feb 2013 00:25:06 +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: 50d9adf8-21a0-4e73-afe7-045aa3d572da X-Archives-Hash: c73afbc9f29655a2a92d1965db1050bf commit: 3507aa783cdf93fd28a58fb32df2fe7e03c46330 Author: Zac Medico gentoo org> AuthorDate: Thu Feb 28 00:24:54 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Feb 28 00:24:54 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=3507aa78 _display_use: use local variables --- pym/_emerge/resolver/output.py | 35 +++++++++++++++-------------------- 1 files changed, 15 insertions(+), 20 deletions(-) diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py index 1ebb248..9e383e2 100644 --- a/pym/_emerge/resolver/output.py +++ b/pym/_emerge/resolver/output.py @@ -58,11 +58,6 @@ class Display(object): self.oldlp = None self.myfetchlist = None self.indent = '' - self.is_new = True - self.cur_use = None - self.cur_iuse = None - self.old_use = '' - self.old_iuse = '' self.use_expand = None self.use_expand_hidden = None self.pkgsettings = None @@ -185,28 +180,28 @@ class Display(object): @param pkg: _emerge.Package.Package instance @param pkg_info: PkgInfo instance Modifies self.use_expand_hidden, self.use_expand, self.verboseadd, - self.forced_flags, self.cur_iuse, self.old_iuse, self.old_use + self.forced_flags """ self.forced_flags = set() self.forced_flags.update(pkg.use.force) self.forced_flags.update(pkg.use.mask) - self.cur_use = [flag for flag in self.conf.pkg_use_enabled(pkg) \ + cur_use = [flag for flag in self.conf.pkg_use_enabled(pkg) \ if flag in pkg.iuse.all] - self.cur_iuse = sorted(pkg.iuse.all) + cur_iuse = sorted(pkg.iuse.all) if pkg_info.previous_pkg is not None: previous_pkg = pkg_info.previous_pkg - self.old_iuse = sorted(previous_pkg.iuse.all) - self.old_use = previous_pkg.use.enabled - self.is_new = False + old_iuse = sorted(previous_pkg.iuse.all) + old_use = previous_pkg.use.enabled + is_new = False else: - self.old_iuse = [] - self.old_use = [] - self.is_new = True + old_iuse = [] + old_use = [] + is_new = True - self.old_use = [flag for flag in self.old_use if flag in self.old_iuse] + old_use = [flag for flag in old_use if flag in old_iuse] self.use_expand = pkg.use.expand self.use_expand_hidden = pkg.use.expand_hidden @@ -233,10 +228,10 @@ class Display(object): reinst_expand_map) cur_iuse_map, iuse_forced = \ - self.map_to_use_expand(self.cur_iuse, forced_flags=True) - cur_use_map = self.map_to_use_expand(self.cur_use) - old_iuse_map = self.map_to_use_expand(self.old_iuse) - old_use_map = self.map_to_use_expand(self.old_use) + self.map_to_use_expand(cur_iuse, forced_flags=True) + cur_use_map = self.map_to_use_expand(cur_use) + old_iuse_map = self.map_to_use_expand(old_iuse) + old_use_map = self.map_to_use_expand(old_use) use_expand = sorted(self.use_expand) use_expand.insert(0, "USE") @@ -248,7 +243,7 @@ class Display(object): self.verboseadd += _create_use_string(self.conf, key.upper(), cur_iuse_map[key], iuse_forced[key], cur_use_map[key], old_iuse_map[key], - old_use_map[key], self.is_new, feature_flags, + old_use_map[key], is_new, feature_flags, reinst_flags_map.get(key)) return