[gentoo-commits] proj/gentoolkit:gentoolkit commit in: pym/gentoolkit/revdep_rebuild/

["Brian Dolbec" <brian.dolbec@gmail.com>]

commit:     6f420c5883d10511f7d339a6843de3be74b0eb68
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 11 07:31:59 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Tue Feb 11 08:09:22 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoolkit.git;a=commit;h=6f420c58

revdep-rebuild: Use set().update() instead of set().union().

---
 pym/gentoolkit/revdep_rebuild/analyse.py |  6 +++---
 pym/gentoolkit/revdep_rebuild/cache.py   |  6 +++---
 pym/gentoolkit/revdep_rebuild/collect.py | 18 +++++++++---------
 pym/gentoolkit/revdep_rebuild/rebuild.py |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pym/gentoolkit/revdep_rebuild/analyse.py b/pym/gentoolkit/revdep_rebuild/analyse.py
index 131849b..6f1787a 100644
--- a/pym/gentoolkit/revdep_rebuild/analyse.py
+++ b/pym/gentoolkit/revdep_rebuild/analyse.py
@@ -157,9 +157,9 @@ def analyse(settings, logger, libraries=None, la_libraries=None,
 
 		masked_dirs, masked_files, ld = \
 			parse_revdep_config(settings['REVDEP_CONFDIR'])
-		lib_dirs = lib_dirs.union(ld)
-		bin_dirs = bin_dirs.union(ld)
-		masked_dirs = masked_dirs.union(
+		lib_dirs.update(ld)
+		bin_dirs.update(ld)
+		masked_dirs.update(
 			set([
 				'/lib/modules',
 				'/lib32/modules',

diff --git a/pym/gentoolkit/revdep_rebuild/cache.py b/pym/gentoolkit/revdep_rebuild/cache.py
index 45b86bd..06f4c67 100644
--- a/pym/gentoolkit/revdep_rebuild/cache.py
+++ b/pym/gentoolkit/revdep_rebuild/cache.py
@@ -110,9 +110,9 @@ if __name__ == '__main__':
 	bin_dirs, lib_dirs = prepare_search_dirs()
 
 	masked_dirs, masked_files, ld = parse_revdep_config()
-	lib_dirs = lib_dirs.union(ld)
-	bin_dirs = bin_dirs.union(ld)
-	masked_dirs = masked_dirs.union(
+	lib_dirs.update(ld)
+	bin_dirs.update(ld)
+	masked_dirs.update(
 		set([
 			'/lib/modules',
 			'/lib32/modules',

diff --git a/pym/gentoolkit/revdep_rebuild/collect.py b/pym/gentoolkit/revdep_rebuild/collect.py
index f8ee60d..281c156 100644
--- a/pym/gentoolkit/revdep_rebuild/collect.py
+++ b/pym/gentoolkit/revdep_rebuild/collect.py
@@ -40,7 +40,7 @@ def parse_conf(conf_file, visited=None, logger=None):
 							else:
 								path = included
 
-							to_parse = to_parse.union(glob.glob(path))
+							to_parse.update(glob.glob(path))
 					else:
 						lib_dirs.add(line)
 		except EnvironmentError:
@@ -49,10 +49,10 @@ def parse_conf(conf_file, visited=None, logger=None):
 	if visited is None:
 		visited = set()
 
-	visited = visited.union(conf_file)
+	visited.update(conf_file)
 	to_parse = to_parse.difference(visited)
 	if to_parse:
-		lib_dirs = lib_dirs.union(parse_conf(to_parse, visited, logger=logger))
+		lib_dirs.update(parse_conf(to_parse, visited, logger=logger))
 
 	return lib_dirs
 
@@ -96,19 +96,19 @@ def parse_revdep_config(revdep_confdir):
 				match = re.match('LD_LIBRARY_MASK=\\"([^"]+)\\"', line)
 				if match is not None:
 					masks = match.group(1).split(' ')
-					masked_files = masked_files.union(masks)
+					masked_files.update(masks)
 					continue
 				match = re.match('SEARCH_DIRS_MASK=\\"([^"]+)\\"', line)
 				if match is not None:
 					searches = match.group(1).split(' ')
 					for search in searches:
-						masked_dirs = masked_dirs.union(glob.glob(search))
+						masked_dirs.update(glob.glob(search))
 					continue
 				match = re.match('SEARCH_DIRS=\\"([^"]+)\\"', line)
 				if match is not None:
 					searches = match.group(1).split()
 					for search in searches:
-						search_dirs = search_dirs.union(glob.glob(search))
+						search_dirs.update(glob.glob(search))
 					continue
 
 	return (masked_dirs, masked_files, search_dirs)
@@ -253,9 +253,9 @@ if __name__ == '__main__':
 	bin_dirs, lib_dirs = prepare_search_dirs(logging)
 
 	masked_dirs, masked_files, ld = parse_revdep_config()
-	lib_dirs = lib_dirs.union(ld)
-	bin_dirs = bin_dirs.union(ld)
-	masked_dirs = masked_dirs.union(
+	lib_dirs.update(ld)
+	bin_dirs.update(ld)
+	masked_dirs.update(
 		set([
 			'/lib/modules',
 			'/lib32/modules',

diff --git a/pym/gentoolkit/revdep_rebuild/rebuild.py b/pym/gentoolkit/revdep_rebuild/rebuild.py
index 888fa47..81e2b34 100644
--- a/pym/gentoolkit/revdep_rebuild/rebuild.py
+++ b/pym/gentoolkit/revdep_rebuild/rebuild.py
@@ -124,7 +124,7 @@ def parse_options():
 			elif key in ('-C', '--nocolor', '--no-color'):
 				settings['nocolor'] = True
 			elif key in ('-L', '--library', '--library='):
-				settings['library'] = settings['library'].union(val.split(','))
+				settings['library'].update(val.split(','))
 			elif key in ('-i', '--ignore'):
 				settings['USE_TMP_FILES'] = False