| 1 |
commit: 6f420c5883d10511f7d339a6843de3be74b0eb68 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 11 07:31:59 2014 +0000 |
| 4 |
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
| 5 |
CommitDate: Tue Feb 11 08:09:22 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoolkit.git;a=commit;h=6f420c58 |
| 7 |
|
| 8 |
revdep-rebuild: Use set().update() instead of set().union(). |
| 9 |
|
| 10 |
--- |
| 11 |
pym/gentoolkit/revdep_rebuild/analyse.py | 6 +++--- |
| 12 |
pym/gentoolkit/revdep_rebuild/cache.py | 6 +++--- |
| 13 |
pym/gentoolkit/revdep_rebuild/collect.py | 18 +++++++++--------- |
| 14 |
pym/gentoolkit/revdep_rebuild/rebuild.py | 2 +- |
| 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 131849b..6f1787a 100644 |
| 19 |
--- a/pym/gentoolkit/revdep_rebuild/analyse.py |
| 20 |
+++ b/pym/gentoolkit/revdep_rebuild/analyse.py |
| 21 |
@@ -157,9 +157,9 @@ def analyse(settings, logger, libraries=None, la_libraries=None, |
| 22 |
|
| 23 |
masked_dirs, masked_files, ld = \ |
| 24 |
parse_revdep_config(settings['REVDEP_CONFDIR']) |
| 25 |
- lib_dirs = lib_dirs.union(ld) |
| 26 |
- bin_dirs = bin_dirs.union(ld) |
| 27 |
- masked_dirs = masked_dirs.union( |
| 28 |
+ lib_dirs.update(ld) |
| 29 |
+ bin_dirs.update(ld) |
| 30 |
+ masked_dirs.update( |
| 31 |
set([ |
| 32 |
'/lib/modules', |
| 33 |
'/lib32/modules', |
| 34 |
|
| 35 |
diff --git a/pym/gentoolkit/revdep_rebuild/cache.py b/pym/gentoolkit/revdep_rebuild/cache.py |
| 36 |
index 45b86bd..06f4c67 100644 |
| 37 |
--- a/pym/gentoolkit/revdep_rebuild/cache.py |
| 38 |
+++ b/pym/gentoolkit/revdep_rebuild/cache.py |
| 39 |
@@ -110,9 +110,9 @@ if __name__ == '__main__': |
| 40 |
bin_dirs, lib_dirs = prepare_search_dirs() |
| 41 |
|
| 42 |
masked_dirs, masked_files, ld = parse_revdep_config() |
| 43 |
- lib_dirs = lib_dirs.union(ld) |
| 44 |
- bin_dirs = bin_dirs.union(ld) |
| 45 |
- masked_dirs = masked_dirs.union( |
| 46 |
+ lib_dirs.update(ld) |
| 47 |
+ bin_dirs.update(ld) |
| 48 |
+ masked_dirs.update( |
| 49 |
set([ |
| 50 |
'/lib/modules', |
| 51 |
'/lib32/modules', |
| 52 |
|
| 53 |
diff --git a/pym/gentoolkit/revdep_rebuild/collect.py b/pym/gentoolkit/revdep_rebuild/collect.py |
| 54 |
index f8ee60d..281c156 100644 |
| 55 |
--- a/pym/gentoolkit/revdep_rebuild/collect.py |
| 56 |
+++ b/pym/gentoolkit/revdep_rebuild/collect.py |
| 57 |
@@ -40,7 +40,7 @@ def parse_conf(conf_file, visited=None, logger=None): |
| 58 |
else: |
| 59 |
path = included |
| 60 |
|
| 61 |
- to_parse = to_parse.union(glob.glob(path)) |
| 62 |
+ to_parse.update(glob.glob(path)) |
| 63 |
else: |
| 64 |
lib_dirs.add(line) |
| 65 |
except EnvironmentError: |
| 66 |
@@ -49,10 +49,10 @@ def parse_conf(conf_file, visited=None, logger=None): |
| 67 |
if visited is None: |
| 68 |
visited = set() |
| 69 |
|
| 70 |
- visited = visited.union(conf_file) |
| 71 |
+ visited.update(conf_file) |
| 72 |
to_parse = to_parse.difference(visited) |
| 73 |
if to_parse: |
| 74 |
- lib_dirs = lib_dirs.union(parse_conf(to_parse, visited, logger=logger)) |
| 75 |
+ lib_dirs.update(parse_conf(to_parse, visited, logger=logger)) |
| 76 |
|
| 77 |
return lib_dirs |
| 78 |
|
| 79 |
@@ -96,19 +96,19 @@ def parse_revdep_config(revdep_confdir): |
| 80 |
match = re.match('LD_LIBRARY_MASK=\\"([^"]+)\\"', line) |
| 81 |
if match is not None: |
| 82 |
masks = match.group(1).split(' ') |
| 83 |
- masked_files = masked_files.union(masks) |
| 84 |
+ masked_files.update(masks) |
| 85 |
continue |
| 86 |
match = re.match('SEARCH_DIRS_MASK=\\"([^"]+)\\"', line) |
| 87 |
if match is not None: |
| 88 |
searches = match.group(1).split(' ') |
| 89 |
for search in searches: |
| 90 |
- masked_dirs = masked_dirs.union(glob.glob(search)) |
| 91 |
+ masked_dirs.update(glob.glob(search)) |
| 92 |
continue |
| 93 |
match = re.match('SEARCH_DIRS=\\"([^"]+)\\"', line) |
| 94 |
if match is not None: |
| 95 |
searches = match.group(1).split() |
| 96 |
for search in searches: |
| 97 |
- search_dirs = search_dirs.union(glob.glob(search)) |
| 98 |
+ search_dirs.update(glob.glob(search)) |
| 99 |
continue |
| 100 |
|
| 101 |
return (masked_dirs, masked_files, search_dirs) |
| 102 |
@@ -253,9 +253,9 @@ if __name__ == '__main__': |
| 103 |
bin_dirs, lib_dirs = prepare_search_dirs(logging) |
| 104 |
|
| 105 |
masked_dirs, masked_files, ld = parse_revdep_config() |
| 106 |
- lib_dirs = lib_dirs.union(ld) |
| 107 |
- bin_dirs = bin_dirs.union(ld) |
| 108 |
- masked_dirs = masked_dirs.union( |
| 109 |
+ lib_dirs.update(ld) |
| 110 |
+ bin_dirs.update(ld) |
| 111 |
+ masked_dirs.update( |
| 112 |
set([ |
| 113 |
'/lib/modules', |
| 114 |
'/lib32/modules', |
| 115 |
|
| 116 |
diff --git a/pym/gentoolkit/revdep_rebuild/rebuild.py b/pym/gentoolkit/revdep_rebuild/rebuild.py |
| 117 |
index 888fa47..81e2b34 100644 |
| 118 |
--- a/pym/gentoolkit/revdep_rebuild/rebuild.py |
| 119 |
+++ b/pym/gentoolkit/revdep_rebuild/rebuild.py |
| 120 |
@@ -124,7 +124,7 @@ def parse_options(): |
| 121 |
elif key in ('-C', '--nocolor', '--no-color'): |
| 122 |
settings['nocolor'] = True |
| 123 |
elif key in ('-L', '--library', '--library='): |
| 124 |
- settings['library'] = settings['library'].union(val.split(',')) |
| 125 |
+ settings['library'].update(val.split(',')) |
| 126 |
elif key in ('-i', '--ignore'): |
| 127 |
settings['USE_TMP_FILES'] = False |
Archives