sablink/entropy
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[entropy.qa] resolve /usr/lib to /usr/lib64 when matching broken library file in repository

Browse Source
This commit is contained in:
Fabio Erculiani
2010-07-13 14:03:35 +02:00
parent 5b92c64fa3
commit 3cf73d5fa8
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
client/text_ui.py
View File

@@ -2166,13 +2166,14 @@ def _libraries_test(entropy_client, listfiles = False, dump = False):
brokenlibs = sorted(brokenlibs)
for lib in brokenlibs:
print_info(darkred(" => ")+red(lib))
print_info(darkgreen(" ## ")+red("%s:" % (_("Matched"),) ))
for mylib in pkgs_matched:
for idpackage, repoid in pkgs_matched[mylib]:
dbconn = entropy_client.open_repository(repoid)
myatom = dbconn.retrieveAtom(idpackage)
atomsdata.add((idpackage, repoid))
print_info(" "+red(mylib)+" => "+brown(myatom)+" ["+red(repoid)+"]")
if pkgs_matched:
print_info(darkgreen(" ## ")+red("%s:" % (_("Matched"),) ))
for mylib in pkgs_matched:
for idpackage, repoid in pkgs_matched[mylib]:
dbconn = entropy_client.open_repository(repoid)
myatom = dbconn.retrieveAtom(idpackage)
atomsdata.add((idpackage, repoid))
print_info(" "+red(mylib)+" => "+brown(myatom)+" ["+red(repoid)+"]")
else:
for mylib in pkgs_matched:
for idpackage, repoid in pkgs_matched[mylib]:

9
libraries/entropy/qa.py
View File

@@ -802,7 +802,14 @@ class QAInterface(TextInterface, EntropyPluginStore):
)
matched = set()
for brokenlib in plain_brokenexecs:
idpackages = dbconn.searchBelongs(brokenlib) # test with /usr/lib
# test with /usr/lib
idpackages = dbconn.searchBelongs(brokenlib)
if not idpackages:
# try with realpath
# on multilib systems this resolves to /usr/lib64
# which makes searchBelongs() happy
idpackages = dbconn.searchBelongs(
os.path.realpath(brokenlib))
for idpackage in idpackages: