| 1 |
commit: 8ba9173f9c082a432a965621b4282e5bbf510e47 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 11 18:21:20 2014 +0000 |
| 4 |
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
| 5 |
CommitDate: Tue Feb 11 18:21:20 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoolkit.git;a=commit;h=8ba9173f |
| 7 |
|
| 8 |
Fix incorrect reporting of some broken files, pkgs. |
| 9 |
|
| 10 |
Fixes previous commit. |
| 11 |
commit: cfeb731d0dc40988cf11f6c225e7082f563d5b18 |
| 12 |
Brian Dolbec <dolsen <AT> gentoo.org> (Tue 11 Feb 2014 12:08:38 AM PST) |
| 13 |
revdep_rebuild/analyse.py: Fix the bug that caused some breakage to not be detected. |
| 14 |
|
| 15 |
--- |
| 16 |
pym/gentoolkit/revdep_rebuild/analyse.py | 19 +++++++------------ |
| 17 |
1 file changed, 7 insertions(+), 12 deletions(-) |
| 18 |
|
| 19 |
diff --git a/pym/gentoolkit/revdep_rebuild/analyse.py b/pym/gentoolkit/revdep_rebuild/analyse.py |
| 20 |
index 8b64835..c416c3c 100644 |
| 21 |
--- a/pym/gentoolkit/revdep_rebuild/analyse.py |
| 22 |
+++ b/pym/gentoolkit/revdep_rebuild/analyse.py |
| 23 |
@@ -106,28 +106,23 @@ def find_broken2(scanned_files, logger): |
| 24 |
for l in needed: |
| 25 |
if l+'|' not in alllibs: |
| 26 |
try: |
| 27 |
- broken_libs[bits][l].add(soname) |
| 28 |
+ broken_libs[bits][l].add(filename) |
| 29 |
except KeyError: |
| 30 |
try: |
| 31 |
- broken_libs[bits][l] = set([soname]) |
| 32 |
+ broken_libs[bits][l] = set([filename]) |
| 33 |
except KeyError: |
| 34 |
- broken_libs = {bits: {l: set([soname])}} |
| 35 |
- #print("BROKEN:", soname, l) |
| 36 |
- |
| 37 |
+ broken_libs = {bits: {l: set([filename])}} |
| 38 |
return broken_libs |
| 39 |
|
| 40 |
|
| 41 |
def main_checks2(broken, scanned_files, logger): |
| 42 |
broken_pathes = [] |
| 43 |
for bits, _broken in broken.items(): |
| 44 |
- for lib, needed in _broken.items(): |
| 45 |
- #print("lib, needed:", lib, needed) |
| 46 |
+ for lib, files in _broken.items(): |
| 47 |
logger.info('Broken files that requires: %s (%s bits)' % (bold(lib), bits)) |
| 48 |
- for n in needed: |
| 49 |
- #print(sorted(needed)) |
| 50 |
- for fp in sorted(scanned_files[bits][n]): |
| 51 |
- logger.info(yellow(' * ') + n + ' (' + fp + ')') |
| 52 |
- broken_pathes.append(fp) |
| 53 |
+ for fp in sorted(files): |
| 54 |
+ logger.info(yellow(' * ') + fp) |
| 55 |
+ broken_pathes.append(fp) |
| 56 |
return broken_pathes |
Archives