From 1727a4ad664daa5b98d7e2e15af8cfc59d13f4dc Mon Sep 17 00:00:00 2001 From: Brian Dolbec Date: Mon, 18 Jan 2016 11:47:26 -0800 Subject: revdep-rebuild/analyse.py: Add file masks to the collecting masks file_masks appear to have been missed being added to the masks passed to the collections functions. Hopefully this will resolve most of the errors people are getting. My testing, only bacula has any errors, but it does not work to add the offending symlink target lib to LD_LIBRARY_MASK. --- pym/gentoolkit/revdep_rebuild/analyse.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pym/gentoolkit/revdep_rebuild/analyse.py b/pym/gentoolkit/revdep_rebuild/analyse.py index 92233ab..b9c18c0 100644 --- a/pym/gentoolkit/revdep_rebuild/analyse.py +++ b/pym/gentoolkit/revdep_rebuild/analyse.py @@ -320,9 +320,15 @@ def analyse(settings, logger, libraries=None, la_libraries=None, stime = current_milli_time() logger.info(green(' * ') + bold('Collecting dynamic linking informations')) + all_masks = masked_dirs.copy() + all_masks.update(masked_files) + logger.debug("\tall_masks:") + for x in sorted(all_masks): + logger.debug('\t\t%s' % (x)) + libraries, la_libraries, libraries_links = \ - collect_libraries_from_dir(lib_dirs, masked_dirs, logger) - binaries = collect_binaries_from_dir(bin_dirs, masked_dirs, logger) + collect_libraries_from_dir(lib_dirs, all_masks, logger) + binaries = collect_binaries_from_dir(bin_dirs, all_masks, logger) ftime = current_milli_time() logger.debug('\ttime to complete task: %d milliseconds' % (ftime-stime)) -- cgit v1.2.3