| 1 |
commit: 4e1cf9a4949072a02c7857dd5715e0dd42116238 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 10 16:38:19 2014 +0000 |
| 4 |
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
| 5 |
CommitDate: Tue Feb 11 08:03:54 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoolkit.git;a=commit;h=4e1cf9a4 |
| 7 |
|
| 8 |
revdep_rebuild: Whitespace cleanup |
| 9 |
|
| 10 |
--- |
| 11 |
pym/gentoolkit/revdep_rebuild/analyse.py | 18 +++++++++--------- |
| 12 |
pym/gentoolkit/revdep_rebuild/cache.py | 8 ++++---- |
| 13 |
pym/gentoolkit/revdep_rebuild/rebuild.py | 5 ++--- |
| 14 |
3 files changed, 15 insertions(+), 16 deletions(-) |
| 15 |
|
| 16 |
diff --git a/pym/gentoolkit/revdep_rebuild/analyse.py b/pym/gentoolkit/revdep_rebuild/analyse.py |
| 17 |
index 4b79c2b..079157a 100644 |
| 18 |
--- a/pym/gentoolkit/revdep_rebuild/analyse.py |
| 19 |
+++ b/pym/gentoolkit/revdep_rebuild/analyse.py |
| 20 |
@@ -49,7 +49,7 @@ def prepare_checks(files_to_check, libraries, bits, cmd_max_args): |
| 21 |
#print d, 'bits:', r[2][8:] # 8: -> strlen('ELFCLASS') |
| 22 |
libs.append(d) |
| 23 |
dependencies.append([r[0],]) |
| 24 |
- |
| 25 |
+ |
| 26 |
return (libs, dependencies) |
| 27 |
|
| 28 |
|
| 29 |
@@ -68,7 +68,7 @@ def scan_files(libs_and_bins, cmd_max_args): |
| 30 |
bits = bits[8:] # 8: -> strlen('ELFCLASS') |
| 31 |
if not soname: |
| 32 |
soname = sfilename |
| 33 |
- |
| 34 |
+ |
| 35 |
try: |
| 36 |
scanned_files[bits][soname] = (filename, needed) |
| 37 |
except KeyError: |
| 38 |
@@ -249,23 +249,23 @@ def analyse(settings, logger, libraries=None, la_libraries=None, |
| 39 |
) |
| 40 |
|
| 41 |
|
| 42 |
- logger.debug('Found %i libraries (+%i symlinks) and %i binaries' % |
| 43 |
+ logger.debug('Found %i libraries (+%i symlinks) and %i binaries' % |
| 44 |
(len(libraries), len(libraries_links), len(binaries)) |
| 45 |
) |
| 46 |
logger.info(green(' * ') + bold('Scanning files')) |
| 47 |
- |
| 48 |
+ |
| 49 |
libs_and_bins = libraries+binaries |
| 50 |
|
| 51 |
scanned_files = scan_files(libs_and_bins, settings['CMD_MAX_ARGS']) |
| 52 |
- |
| 53 |
+ |
| 54 |
logger.warn(green(' * ') + bold('Checking dynamic linking consistency')) |
| 55 |
- logger.debug('Search for %i within %i' % |
| 56 |
+ logger.debug('Search for %i within %i' % |
| 57 |
(len(binaries)+len(libraries), len(libraries)+len(libraries_links)) |
| 58 |
) |
| 59 |
- |
| 60 |
+ |
| 61 |
broken = find_broken2(scanned_files, logger) |
| 62 |
broken_pathes = main_checks2(broken, scanned_files, logger) |
| 63 |
- |
| 64 |
+ |
| 65 |
broken_la = extract_dependencies_from_la(la_libraries, libraries+libraries_links, _libs_to_check, logger) |
| 66 |
broken_pathes += broken_la |
| 67 |
|
| 68 |
@@ -273,9 +273,9 @@ def analyse(settings, logger, libraries=None, la_libraries=None, |
| 69 |
|
| 70 |
return assign_packages(broken_pathes, logger, settings) |
| 71 |
|
| 72 |
- |
| 73 |
#import sys |
| 74 |
#sys.exit() |
| 75 |
+ |
| 76 |
#l = [] |
| 77 |
#for line in call_program(['scanelf', '-M', '64', '-BF', '%F',] + libraries).strip().split('\n'): |
| 78 |
#l.append(line) |
| 79 |
|
| 80 |
diff --git a/pym/gentoolkit/revdep_rebuild/cache.py b/pym/gentoolkit/revdep_rebuild/cache.py |
| 81 |
index 1be8cb0..42bf1ea 100644 |
| 82 |
--- a/pym/gentoolkit/revdep_rebuild/cache.py |
| 83 |
+++ b/pym/gentoolkit/revdep_rebuild/cache.py |
| 84 |
@@ -114,8 +114,8 @@ if __name__ == '__main__': |
| 85 |
bin_dirs = bin_dirs.union(ld) |
| 86 |
masked_dirs = masked_dirs.union( |
| 87 |
set([ |
| 88 |
- '/lib/modules', |
| 89 |
- '/lib32/modules', |
| 90 |
+ '/lib/modules', |
| 91 |
+ '/lib32/modules', |
| 92 |
'/lib64/modules', |
| 93 |
]) |
| 94 |
) |
| 95 |
@@ -123,8 +123,8 @@ if __name__ == '__main__': |
| 96 |
libraries, la_libraries, libraries_links, symlink_pairs = collect_libraries_from_dir(lib_dirs, masked_dirs, logging) |
| 97 |
binaries = collect_binaries_from_dir(bin_dirs, masked_dirs, logging) |
| 98 |
|
| 99 |
- save_cache(logger=logging, |
| 100 |
- to_save={'libraries':libraries, 'la_libraries':la_libraries, |
| 101 |
+ save_cache(logger=logging, |
| 102 |
+ to_save={'libraries':libraries, 'la_libraries':la_libraries, |
| 103 |
'libraries_links':libraries_links, 'binaries':binaries} |
| 104 |
) |
| 105 |
|
| 106 |
|
| 107 |
diff --git a/pym/gentoolkit/revdep_rebuild/rebuild.py b/pym/gentoolkit/revdep_rebuild/rebuild.py |
| 108 |
index 386ac33..95f2b5e 100644 |
| 109 |
--- a/pym/gentoolkit/revdep_rebuild/rebuild.py |
| 110 |
+++ b/pym/gentoolkit/revdep_rebuild/rebuild.py |
| 111 |
@@ -209,12 +209,11 @@ def main(settings=None, logger=None): |
| 112 |
elif not settings['PRETEND'] \ |
| 113 |
and settings['IS_DEV'] \ |
| 114 |
and not settings['NO_PRETEND']: |
| 115 |
- logger.warn(blue(' * ') + |
| 116 |
+ logger.warn(blue(' * ') + |
| 117 |
yellow('This is a development version, ' |
| 118 |
'so it may not work correctly')) |
| 119 |
- logger.warn(blue(' * ') + |
| 120 |
yellow('Adding --pretend to portage options anyway')) |
| 121 |
- logger.info(blue(' * ') + |
| 122 |
+ logger.info(blue(' * ') + |
| 123 |
'If you\'re sure, you can add --no-pretend to revdep options') |
| 124 |
settings['PRETEND'] = True |
Archives