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

[equo] use EntropyRepository.retrieveContentIter() where possible

Browse Source
This commit is contained in:
Fabio Erculiani
2012-07-27 16:32:56 +02:00
parent d75ce83086
commit 137e145d2d
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
client/text_query.py
View File

@@ -542,21 +542,24 @@ def search_files(packages, entropy_client, entropy_repository):
if pkg_id == -1:
continue
files = entropy_repository.retrieveContent(pkg_id)
atom = entropy_repository.retrieveAtom(pkg_id)
files = sorted(files)
files = entropy_repository.retrieveContentIter(
pkg_id, order_by="file")
files_len = 0
if etpUi['quiet']:
for xfile in files:
for xfile, ftype in files:
files_len += 1
print_generic(xfile)
else:
for xfile in files:
for xfile, ftype in files:
files_len += 1
print_info(blue(" ### ") + red(xfile))
if not etpUi['quiet']:
toc = []
toc.append(("%s:" % (blue(_("Package")),), purple(atom)))
toc.append(("%s:" % (blue(_("Found")),), "%s %s" % (
len(files), brown(_("files")),)))
files_len, brown(_("files")),)))
print_table(toc)
return 0
@@ -657,7 +660,7 @@ def search_orphaned_files(entropy_client):
count = 0
def gen_cont(pkg_id):
for path in repo.retrieveContent(pkg_id):
for path, ftype in repo.retrieveContentIter(pkg_id):
# reverse sym
for sym_dir in reverse_symlink_map:
if path.startswith(sym_dir):

4
client/text_rescue.py
View File

@@ -335,8 +335,8 @@ def _database_resurrect(entropy_client):
)
print_info(mytxt, back = True)
# content
content = dbconn.retrieveContent(idpackage)
for item in content:
content = dbconn.retrieveContentIter(idpackage)
for item, ftype in content:
if etpConst['systemroot']+item in filelist:
pkgsfound.add((idpackage, repo))
atoms[(idpackage, repo)] = idpackageatom