Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/
Date: Sat, 29 Oct 2011 21:31:23
Message-Id: d40181d1760b3d04788884f7907c8ded18c0bd1c.zmedico@gentoo
1 commit: d40181d1760b3d04788884f7907c8ded18c0bd1c
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 29 21:31:00 2011 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 29 21:31:00 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d40181d1
7
8 actions.py: remove unused variables
9
10 ---
11 pym/_emerge/actions.py | 10 +---------
12 1 files changed, 1 insertions(+), 9 deletions(-)
13
14 diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
15 index 6ccf894..28fe549 100644
16 --- a/pym/_emerge/actions.py
17 +++ b/pym/_emerge/actions.py
18 @@ -1145,7 +1145,6 @@ def calc_depclean(settings, trees, ldpath_mtimes,
19
20 for node in clean_set:
21 graph.add(node, None)
22 - mydeps = []
23 for dep_type in dep_keys:
24 depstr = node.metadata[dep_type]
25 if not depstr:
26 @@ -1434,8 +1433,6 @@ def action_info(settings, trees, myopts, myfiles):
27 append("%s %s" % \
28 ((cp + ":").ljust(cp_max_len + 1), versions))
29
30 - libtool_vers = ",".join(vardb.match("sys-devel/libtool"))
31 -
32 repos = portdb.settings.repositories
33 if "--verbose" in myopts:
34 append("Repositories:\n")
35 @@ -1472,9 +1469,6 @@ def action_info(settings, trees, myopts, myfiles):
36 myvars = portage.util.unique_array(myvars)
37 use_expand = settings.get('USE_EXPAND', '').split()
38 use_expand.sort()
39 - use_expand_hidden = set(
40 - settings.get('USE_EXPAND_HIDDEN', '').upper().split())
41 - alphabetical_use = '--alphabetical' in myopts
42 unset_vars = []
43 myvars.sort()
44 for k in myvars:
45 @@ -1551,7 +1545,6 @@ def action_info(settings, trees, myopts, myfiles):
46 mydesiredvars = [ 'CHOST', 'CFLAGS', 'CXXFLAGS', 'LDFLAGS' ]
47 auxkeys = mydesiredvars + list(vardb._aux_cache_keys)
48 auxkeys.append('DEFINED_PHASES')
49 - global_vals = {}
50 pkgsettings = portage.config(clone=settings)
51
52 # Loop through each package
53 @@ -1723,7 +1716,6 @@ def action_metadata(settings, portdb, myopts, porttrees=None):
54 for tree_data in porttrees_data:
55
56 src_chf = tree_data.src_db.validation_chf
57 - src_chf_key = '_%s_' % src_chf
58 dest_chf = tree_data.dest_db.validation_chf
59 dest_chf_key = '_%s_' % dest_chf
60 dest_chf_getter = operator.attrgetter(dest_chf)
61 @@ -1874,7 +1866,7 @@ def action_regen(settings, portdb, max_jobs, max_load):
62 #regenerate cache entries
63 try:
64 os.close(sys.stdin.fileno())
65 - except SystemExit as e:
66 + except SystemExit:
67 raise # Needed else can't exit
68 except:
69 pass