1 |
commit: 4576c230e52a09fae3f45d872be158259297846a |
2 |
Author: dol-sen <brian.dolbec <AT> gmail <DOT> com> |
3 |
AuthorDate: Wed Jul 13 05:32:42 2011 +0000 |
4 |
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
5 |
CommitDate: Wed Jul 13 05:32:42 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoolkit.git;a=commit;h=4576c230 |
7 |
|
8 |
fix the use of set updates and the with statement. |
9 |
|
10 |
--- |
11 |
pym/gentoolkit/revdep_rebuild/analyse.py | 4 ++-- |
12 |
pym/gentoolkit/revdep_rebuild/assign.py | 2 +- |
13 |
pym/gentoolkit/revdep_rebuild/cache.py | 6 +++--- |
14 |
pym/gentoolkit/revdep_rebuild/collect.py | 20 ++++++++++---------- |
15 |
4 files changed, 16 insertions(+), 16 deletions(-) |
16 |
|
17 |
diff --git a/pym/gentoolkit/revdep_rebuild/analyse.py b/pym/gentoolkit/revdep_rebuild/analyse.py |
18 |
index 34ef55b..69651ca 100644 |
19 |
--- a/pym/gentoolkit/revdep_rebuild/analyse.py |
20 |
+++ b/pym/gentoolkit/revdep_rebuild/analyse.py |
21 |
@@ -146,8 +146,8 @@ def analyse(settings, logger, libraries=None, la_libraries=None, |
22 |
bin_dirs, lib_dirs = prepare_search_dirs(logger, settings) |
23 |
|
24 |
masked_dirs, masked_files, ld = parse_revdep_config(settings['REVDEP_CONFDIR']) |
25 |
- lib_dirs = lib_dirs.union(ld) |
26 |
- bin_dirs = bin_dirs.union(ld) |
27 |
+ lib_dirs.update(ld) |
28 |
+ bin_dirs.update(ld) |
29 |
masked_dirs = masked_dirs.union(set(['/lib/modules', '/lib32/modules', '/lib64/modules',])) |
30 |
|
31 |
logger.info(green(' * ') + bold('Collecting dynamic linking informations')) |
32 |
|
33 |
diff --git a/pym/gentoolkit/revdep_rebuild/assign.py b/pym/gentoolkit/revdep_rebuild/assign.py |
34 |
index f7f0304..5ed938e 100644 |
35 |
--- a/pym/gentoolkit/revdep_rebuild/assign.py |
36 |
+++ b/pym/gentoolkit/revdep_rebuild/assign.py |
37 |
@@ -19,7 +19,7 @@ def assign_packages(broken, logger, settings): |
38 |
if os.path.exists(f): |
39 |
try: |
40 |
with open(f, 'r') as cnt: |
41 |
- for line in cnt.readlines(): |
42 |
+ for line in cnt: |
43 |
m = re.match('^obj (/[^ ]+)', line) |
44 |
if m is not None: |
45 |
m = m.group(1) |
46 |
|
47 |
diff --git a/pym/gentoolkit/revdep_rebuild/cache.py b/pym/gentoolkit/revdep_rebuild/cache.py |
48 |
index 6d21016..ef46314 100644 |
49 |
--- a/pym/gentoolkit/revdep_rebuild/cache.py |
50 |
+++ b/pym/gentoolkit/revdep_rebuild/cache.py |
51 |
@@ -92,9 +92,9 @@ if __name__ == '__main__': |
52 |
bin_dirs, lib_dirs = prepare_search_dirs() |
53 |
|
54 |
masked_dirs, masked_files, ld = parse_revdep_config() |
55 |
- lib_dirs = lib_dirs.union(ld) |
56 |
- bin_dirs = bin_dirs.union(ld) |
57 |
- masked_dirs = masked_dirs.union(set(['/lib/modules', '/lib32/modules', '/lib64/modules',])) |
58 |
+ lib_dirs.update(ld) |
59 |
+ bin_dirs.update(ld) |
60 |
+ masked_dirs = masked_dirs.update(['/lib/modules', '/lib32/modules', '/lib64/modules',]) |
61 |
|
62 |
libraries, la_libraries, libraries_links, symlink_pairs = collect_libraries_from_dir(lib_dirs, masked_dirs, logging) |
63 |
binaries = collect_binaries_from_dir(bin_dirs, masked_dirs, logging) |
64 |
|
65 |
diff --git a/pym/gentoolkit/revdep_rebuild/collect.py b/pym/gentoolkit/revdep_rebuild/collect.py |
66 |
index e5df8e3..8d80e21 100644 |
67 |
--- a/pym/gentoolkit/revdep_rebuild/collect.py |
68 |
+++ b/pym/gentoolkit/revdep_rebuild/collect.py |
69 |
@@ -23,7 +23,7 @@ def parse_conf(conf_file, visited=None, logger=None): |
70 |
for conf in conf_file: |
71 |
try: |
72 |
with open(conf) as f: |
73 |
- for line in f.readlines(): |
74 |
+ for line in f: |
75 |
line = line.strip() |
76 |
if line.startswith('#'): |
77 |
continue |
78 |
@@ -36,7 +36,7 @@ def parse_conf(conf_file, visited=None, logger=None): |
79 |
else: |
80 |
path = included |
81 |
|
82 |
- to_parse = to_parse.union(glob.glob(path)) |
83 |
+ to_parse.update(glob.glob(path)) |
84 |
else: |
85 |
lib_dirs.add(line) |
86 |
except EnvironmentError: |
87 |
@@ -45,10 +45,10 @@ def parse_conf(conf_file, visited=None, logger=None): |
88 |
if visited is None: |
89 |
visited = set() |
90 |
|
91 |
- visited = visited.union(conf_file) |
92 |
- to_parse = to_parse.difference(visited) |
93 |
+ visited.update(conf_file) |
94 |
+ to_parse.difference_update(visited) |
95 |
if to_parse: |
96 |
- lib_dirs = lib_dirs.union(parse_conf(to_parse, visited, logger=logger)) |
97 |
+ lib_dirs.update(parse_conf(to_parse, visited, logger=logger)) |
98 |
|
99 |
return lib_dirs |
100 |
|
101 |
@@ -63,11 +63,11 @@ def prepare_search_dirs(logger, settings): |
102 |
|
103 |
#try: |
104 |
with open(os.path.join(portage.root, settings['DEFAULT_ENV_FILE']), 'r') as f: |
105 |
- for line in f.readlines(): |
106 |
+ for line in f: |
107 |
line = line.strip() |
108 |
m = re.match("^export (ROOT)?PATH='([^']+)'", line) |
109 |
if m is not None: |
110 |
- bin_dirs = bin_dirs.union(set(m.group(2).split(':'))) |
111 |
+ bin_dirs.update(set(m.group(2).split(':'))) |
112 |
#except EnvironmentError: |
113 |
#logger.debug(yellow('Could not open file %s' % f)) |
114 |
|
115 |
@@ -233,9 +233,9 @@ if __name__ == '__main__': |
116 |
bin_dirs, lib_dirs = prepare_search_dirs(logging) |
117 |
|
118 |
masked_dirs, masked_files, ld = parse_revdep_config() |
119 |
- lib_dirs = lib_dirs.union(ld) |
120 |
- bin_dirs = bin_dirs.union(ld) |
121 |
- masked_dirs = masked_dirs.union(set(['/lib/modules', '/lib32/modules', '/lib64/modules',])) |
122 |
+ lib_dirs.update(ld) |
123 |
+ bin_dirs.update(ld) |
124 |
+ masked_dirs.update(['/lib/modules', '/lib32/modules', '/lib64/modules']) |
125 |
|
126 |
libraries, la_libraries, libraries_links, symlink_pairs = collect_libraries_from_dir(lib_dirs, masked_dirs, logging) |
127 |
binaries = collect_binaries_from_dir(bin_dirs, masked_dirs, logging) |