diff options
| author | Brian Dolbec <dolsen@gentoo.org> | 2014-02-10 08:38:19 -0800 |
|---|---|---|
| committer | Brian Dolbec <dolsen@gentoo.org> | 2014-02-11 00:03:54 -0800 |
| commit | 4e1cf9a4949072a02c7857dd5715e0dd42116238 (patch) | |
| tree | cfd3e2d1850e4c6612ad543bf1131aac1caff784 | |
| parent | 70edf148e08d843abe5c2a8bea262dc5e98330e1 (diff) | |
| download | gentoolkit-4e1cf9a4949072a02c7857dd5715e0dd42116238.tar.gz | |
revdep_rebuild: Whitespace cleanup
| -rw-r--r-- | pym/gentoolkit/revdep_rebuild/analyse.py | 18 | ||||
| -rw-r--r-- | pym/gentoolkit/revdep_rebuild/cache.py | 8 | ||||
| -rw-r--r-- | pym/gentoolkit/revdep_rebuild/rebuild.py | 5 |
3 files changed, 15 insertions, 16 deletions
diff --git a/pym/gentoolkit/revdep_rebuild/analyse.py b/pym/gentoolkit/revdep_rebuild/analyse.py index 4b79c2b..079157a 100644 --- a/pym/gentoolkit/revdep_rebuild/analyse.py +++ b/pym/gentoolkit/revdep_rebuild/analyse.py @@ -49,7 +49,7 @@ def prepare_checks(files_to_check, libraries, bits, cmd_max_args): #print d, 'bits:', r[2][8:] # 8: -> strlen('ELFCLASS') libs.append(d) dependencies.append([r[0],]) - + return (libs, dependencies) @@ -68,7 +68,7 @@ def scan_files(libs_and_bins, cmd_max_args): bits = bits[8:] # 8: -> strlen('ELFCLASS') if not soname: soname = sfilename - + try: scanned_files[bits][soname] = (filename, needed) except KeyError: @@ -249,23 +249,23 @@ def analyse(settings, logger, libraries=None, la_libraries=None, ) - logger.debug('Found %i libraries (+%i symlinks) and %i binaries' % + logger.debug('Found %i libraries (+%i symlinks) and %i binaries' % (len(libraries), len(libraries_links), len(binaries)) ) logger.info(green(' * ') + bold('Scanning files')) - + libs_and_bins = libraries+binaries scanned_files = scan_files(libs_and_bins, settings['CMD_MAX_ARGS']) - + logger.warn(green(' * ') + bold('Checking dynamic linking consistency')) - logger.debug('Search for %i within %i' % + logger.debug('Search for %i within %i' % (len(binaries)+len(libraries), len(libraries)+len(libraries_links)) ) - + broken = find_broken2(scanned_files, logger) broken_pathes = main_checks2(broken, scanned_files, logger) - + broken_la = extract_dependencies_from_la(la_libraries, libraries+libraries_links, _libs_to_check, logger) broken_pathes += broken_la @@ -273,9 +273,9 @@ def analyse(settings, logger, libraries=None, la_libraries=None, return assign_packages(broken_pathes, logger, settings) - #import sys #sys.exit() + #l = [] #for line in call_program(['scanelf', '-M', '64', '-BF', '%F',] + libraries).strip().split('\n'): #l.append(line) diff --git a/pym/gentoolkit/revdep_rebuild/cache.py b/pym/gentoolkit/revdep_rebuild/cache.py index 1be8cb0..42bf1ea 100644 --- a/pym/gentoolkit/revdep_rebuild/cache.py +++ b/pym/gentoolkit/revdep_rebuild/cache.py @@ -114,8 +114,8 @@ if __name__ == '__main__': bin_dirs = bin_dirs.union(ld) masked_dirs = masked_dirs.union( set([ - '/lib/modules', - '/lib32/modules', + '/lib/modules', + '/lib32/modules', '/lib64/modules', ]) ) @@ -123,8 +123,8 @@ if __name__ == '__main__': libraries, la_libraries, libraries_links, symlink_pairs = collect_libraries_from_dir(lib_dirs, masked_dirs, logging) binaries = collect_binaries_from_dir(bin_dirs, masked_dirs, logging) - save_cache(logger=logging, - to_save={'libraries':libraries, 'la_libraries':la_libraries, + save_cache(logger=logging, + to_save={'libraries':libraries, 'la_libraries':la_libraries, 'libraries_links':libraries_links, 'binaries':binaries} ) diff --git a/pym/gentoolkit/revdep_rebuild/rebuild.py b/pym/gentoolkit/revdep_rebuild/rebuild.py index 386ac33..95f2b5e 100644 --- a/pym/gentoolkit/revdep_rebuild/rebuild.py +++ b/pym/gentoolkit/revdep_rebuild/rebuild.py @@ -209,12 +209,11 @@ def main(settings=None, logger=None): elif not settings['PRETEND'] \ and settings['IS_DEV'] \ and not settings['NO_PRETEND']: - logger.warn(blue(' * ') + + logger.warn(blue(' * ') + 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(' * ') + + logger.info(blue(' * ') + 'If you\'re sure, you can add --no-pretend to revdep options') settings['PRETEND'] = True |
