| 1 |
commit: 1727a4ad664daa5b98d7e2e15af8cfc59d13f4dc |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 18 19:47:26 2016 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 25 21:24:55 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=1727a4ad |
| 7 |
|
| 8 |
revdep-rebuild/analyse.py: Add file masks to the collecting masks |
| 9 |
|
| 10 |
file_masks appear to have been missed being added to the masks passed to the |
| 11 |
collections functions. Hopefully this will resolve most of the errors people are getting. |
| 12 |
My testing, only bacula has any errors, but it does not work to add the offending symlink |
| 13 |
target lib to LD_LIBRARY_MASK. |
| 14 |
|
| 15 |
pym/gentoolkit/revdep_rebuild/analyse.py | 10 ++++++++-- |
| 16 |
1 file changed, 8 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/pym/gentoolkit/revdep_rebuild/analyse.py b/pym/gentoolkit/revdep_rebuild/analyse.py |
| 19 |
index 92233ab..b9c18c0 100644 |
| 20 |
--- a/pym/gentoolkit/revdep_rebuild/analyse.py |
| 21 |
+++ b/pym/gentoolkit/revdep_rebuild/analyse.py |
| 22 |
@@ -320,9 +320,15 @@ def analyse(settings, logger, libraries=None, la_libraries=None, |
| 23 |
stime = current_milli_time() |
| 24 |
logger.info(green(' * ') + |
| 25 |
bold('Collecting dynamic linking informations')) |
| 26 |
+ all_masks = masked_dirs.copy() |
| 27 |
+ all_masks.update(masked_files) |
| 28 |
+ logger.debug("\tall_masks:") |
| 29 |
+ for x in sorted(all_masks): |
| 30 |
+ logger.debug('\t\t%s' % (x)) |
| 31 |
+ |
| 32 |
libraries, la_libraries, libraries_links = \ |
| 33 |
- collect_libraries_from_dir(lib_dirs, masked_dirs, logger) |
| 34 |
- binaries = collect_binaries_from_dir(bin_dirs, masked_dirs, logger) |
| 35 |
+ collect_libraries_from_dir(lib_dirs, all_masks, logger) |
| 36 |
+ binaries = collect_binaries_from_dir(bin_dirs, all_masks, logger) |
| 37 |
ftime = current_milli_time() |
| 38 |
logger.debug('\ttime to complete task: %d milliseconds' % (ftime-stime)) |
Archives