diff options
| author | lis.slawek <lis.slawek@5234894e-44cd-11de-9a4c-a76526a193c6> | 2010-11-18 11:16:57 +0000 |
|---|---|---|
| committer | Paul Varner <fuzzyray@gentoo.org> | 2011-07-12 16:29:00 -0500 |
| commit | a928c7509defc63c913ab61ef138cc59d44c38b6 (patch) | |
| tree | f8e1361bfe92dc7f84c1885c18cac716ba23eab4 | |
| parent | 016a60ce9a134f1dba61bcbae6e0b5a286cf6c90 (diff) | |
| download | gentoolkit-a928c7509defc63c913ab61ef138cc59d44c38b6.tar.gz | |
Fixed scanning revdep config; minor fix in analyse function
git-svn-id: http://genscripts.googlecode.com/svn/trunk/gentoolkit@485 5234894e-44cd-11de-9a4c-a76526a193c6
| -rwxr-xr-x | pym/gentoolkit/revdep_rebuild/revdep-rebuild.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pym/gentoolkit/revdep_rebuild/revdep-rebuild.py b/pym/gentoolkit/revdep_rebuild/revdep-rebuild.py index 0bc006e..f8f67d6 100755 --- a/pym/gentoolkit/revdep_rebuild/revdep-rebuild.py +++ b/pym/gentoolkit/revdep_rebuild/revdep-rebuild.py @@ -210,9 +210,9 @@ def parse_revdep_config(): continue m = re.match('SEARCH_DIRS=\\"([^"]+)\\"', line) if m is not None: - s = m.group(1).split(' ') + s = m.group(1).split() for ss in s: - search_dirs = masked_dirs.union(glob.glob(ss)) + search_dirs = search_dirs.union(glob.glob(ss)) continue return (masked_dirs, masked_files, search_dirs) @@ -615,7 +615,7 @@ def analyse(output=print_v, libraries=None, la_libraries=None, libraries_links=N elif _bits.startswith('64'): bits = 64 - for av_bits in glob.glob('/lib[0-9]*'): + for av_bits in glob.glob('/lib[0-9]*') or ('/lib32',): bits = int(av_bits[4:]) _libraries = call_program(['scanelf', '-M', str(bits), '-BF', '%F',] + libraries+libraries_links).strip().split('\n') @@ -740,6 +740,11 @@ if __name__ == "__main__": args += ' --verbose' elif VERBOSITY < 1: args += ' --quiet' + + if len(emerge_command) == 0: + print_v(1, bold('\nThere is nothing to emerge. Exiting.')) + sys.exit(0) + emerge_command = args + ' --oneshot ' + emerge_command |