From ec7d92db0d82c1ca91860e9a29c102d918debbee Mon Sep 17 00:00:00 2001 From: Brian Dolbec Date: Thu, 31 Dec 2015 14:27:28 -0800 Subject: [PATCH] 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 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pym/gentoolkit/revdep_rebuild/analyse.py b/pym/gentoolkit/revdep_rebuild/analyse.py index 92233ab..eb33fcd 100644 --- a/pym/gentoolkit/revdep_rebuild/analyse.py +++ b/pym/gentoolkit/revdep_rebuild/analyse.py @@ -320,9 +320,14 @@ 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) ftime = current_milli_time() logger.debug('\ttime to complete task: %d milliseconds' % (ftime-stime)) -- 2.6.4