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.

diff --git a/pym/gentoolkit/revdep_rebuild/analyse.py b/pym/gentoolkit/revdep_rebuild/analyse.py
index 3061328d1db770eb68ed57fdf2fb9b53f115b513..34ef55bea6b3cb5b7852268402938f2c64695280 100644 (file)
--- 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 b7ed4698296283caf67b36154c160f7d7c4b38a7..e5df8e3ddaa9db6050e740606bfc769055daa1cd 100644 (file)
--- 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 778c528b8fad05d34761894f7308d1ffc567ccea..9ac4811707f86d4cc2f2ed8b1ccb5c71b0f8e558 100644 (file)
--- 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'] \