[patch] Patch proposal

fix_emerge_options_parsing.patch (text/plain), 2.32 KB, created by bzoloid on 2017-02-25 16:49:35 UTC

diff -u a/pym/gentoolkit/revdep_rebuild/rebuild.py b/pym/gentoolkit/revdep_rebuild/rebuild.py
--- a/pym/gentoolkit/revdep_rebuild/rebuild.py
+++ b/pym/gentoolkit/revdep_rebuild/rebuild.py
@@ -65,34 +65,33 @@
 def rebuild(logger, assigned, settings):
 	"""rebuilds the assigned pkgs"""
 
-	args = settings['pass_through_options']
+	args = list(settings['pass_through_options'])
 	if settings['EXACT']:
 		_assigned = filter_masked(assigned, logger)
-		emerge_command = '=' + ' ='.join(_assigned)
+		emerge_command = ['='+a for a in _assigned]
 	else:
 		_assigned = get_slotted_cps(assigned, logger)
-		emerge_command = ' '.join(_assigned)
+		emerge_command = [a for a in _assigned]
 	if settings['PRETEND']:
-		args += ' --pretend'
+		args.append('--pretend')
 	if settings['VERBOSITY'] >= 2:
-		args += ' --verbose'
+		args.append('--verbose')
 	elif settings['VERBOSITY'] < 1:
-		args += ' --quiet'
+		args.append('--quiet')
 	if settings['nocolor']:
-		args += ' --color n'
+		args.extend(['--color', 'n'])
 
 	if len(emerge_command) == 0:
 		logger.warning(bold('\nThere is nothing to emerge. Exiting.'))
 		return 0
 
 	logger.warning(yellow(
-		'\nemerge') + args +
+		'\nemerge') +  ' ' + ' '.join(args) +
 		' --oneshot --complete-graph=y ' +
-		bold(emerge_command))
+		bold(' '.join(emerge_command)))
 
 	stime = current_milli_time()
-	_args = 'emerge ' + args + ' --oneshot --complete-graph=y ' + emerge_command
-	_args = _args.split()
+	_args = ['emerge'] + args + ['--oneshot', '--complete-graph=y'] + emerge_command
 	success = subprocess.call(_args)
 	ftime = current_milli_time()
 	logger.debug("\trebuild(); emerge call for %d ebuilds took: %s seconds"
diff -u a/pym/gentoolkit/revdep_rebuild/settings.py b/pym/gentoolkit/revdep_rebuild/settings.py
--- a/pym/gentoolkit/revdep_rebuild/settings.py
+++ b/pym/gentoolkit/revdep_rebuild/settings.py
@@ -39,7 +39,7 @@
 		'debug': False,
 		'no-ld-path': False,
 		'no-order': False,
-		'pass_through_options': '',
+		'pass_through_options': [],
 		'stdout': sys.stdout,
 		'stdin': sys.stdin,
 		'stderr': sys.stderr
@@ -114,7 +114,7 @@
 	if args.library:
 		settings['library'].update(set(args.library))
 	settings['USE_TMP_FILES'] = not args.ignore
-	settings['pass_through_options'] = " " + " ".join(args.portage_options)
+	settings['pass_through_options'].extend(args.portage_options)
 
 	return settings