From e7ed5b3dfb74f524d298aedf7a4207d50dbee689 Mon Sep 17 00:00:00 2001 From: Paul Varner Date: Tue, 12 Jul 2011 16:26:14 -0500 Subject: [PATCH] Remove automatic adding of pretend to revdep-rebuild options. Fix la file checker to find .a libraries referenced. Add --complete-graph=y to emerge command. --- pym/gentoolkit/revdep_rebuild/analyse.py | 2 +- pym/gentoolkit/revdep_rebuild/collect.py | 2 +- pym/gentoolkit/revdep_rebuild/rebuild.py | 9 +++------ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/pym/gentoolkit/revdep_rebuild/analyse.py b/pym/gentoolkit/revdep_rebuild/analyse.py index 3061328..34ef55b 100644 --- a/pym/gentoolkit/revdep_rebuild/analyse.py +++ b/pym/gentoolkit/revdep_rebuild/analyse.py @@ -61,7 +61,7 @@ def extract_dependencies_from_la(la, libraries, to_check, logger): if m is not None: for el in m.group(1).split(' '): el = el.strip() - if len(el) < 1 or el.startswith('-L'): + if len(el) < 1 or el.startswith('-L') or el.startswith('-R'): continue if el.startswith('-l') and 'lib'+el[2:] in libnames: diff --git a/pym/gentoolkit/revdep_rebuild/collect.py b/pym/gentoolkit/revdep_rebuild/collect.py index b7ed469..e5df8e3 100644 --- a/pym/gentoolkit/revdep_rebuild/collect.py +++ b/pym/gentoolkit/revdep_rebuild/collect.py @@ -140,7 +140,7 @@ def collect_libraries_from_dir(dirs, mask, logger): else: found_directories.append(l) elif os.path.isfile(l): - if l.endswith('.so') or '.so.' in l: + if l.endswith('.so') or '.so.' or l.endswith('.a') in l: if l in found_files or l in found_symlinks: continue diff --git a/pym/gentoolkit/revdep_rebuild/rebuild.py b/pym/gentoolkit/revdep_rebuild/rebuild.py index 778c528..9ac4811 100644 --- a/pym/gentoolkit/revdep_rebuild/rebuild.py +++ b/pym/gentoolkit/revdep_rebuild/rebuild.py @@ -161,9 +161,9 @@ def rebuild(logger, assigned, settings): emerge_command = emerge_command - logger.warn(yellow('\nemerge') + args + ' --oneshot ' + bold(emerge_command)) + logger.warn(yellow('\nemerge') + args + ' --oneshot --complete-graph=y ' + bold(emerge_command)) - success = os.system('emerge ' + args + ' --oneshot ' + emerge_command) + success = os.system('emerge ' + args + ' --oneshot --complete-graph=y ' + emerge_command) return success @@ -193,10 +193,7 @@ def main(settings=None, logger=None): yellow('This is a development version, ' 'so it may not work correctly')) logger.warn(blue(' * ') + - yellow('Adding --pretend to portage options anyway')) - logger.info(blue(' * ') + - 'If you\'re sure, you can add --no-pretend to revdep options') - settings['PRETEND'] = True + yellow('The original revdep-rebuild script is installed as revdep-rebuild.sh')) analyze_cache = {} if settings['USE_TMP_FILES'] \ -- 2.26.2