From 477dd941e6a3a01d55c1cdb46fa485f3c9e8e2ca Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Thu, 28 Jan 2010 20:00:03 +0100 Subject: [PATCH] [equo] text_query: remove dead code --- client/text_query.py | 42 ++++++++++-------------------------------- 1 file changed, 10 insertions(+), 32 deletions(-) diff --git a/client/text_query.py b/client/text_query.py index 4f127b781..84766e7fb 100644 --- a/client/text_query.py +++ b/client/text_query.py @@ -1238,15 +1238,11 @@ def match_package(packages, multiMatch = False, multiRepo = False, return rc_results return 0 -def search_slotted_packages(slots, dbconn = None, Equo = None): +def search_slotted_packages(slots, Equo = None): if Equo is None: Equo = EquoInterface() - dbclose = True - if dbconn: - dbclose = False - found = False if not etpUi['quiet']: print_info(darkred(" @@ ") + darkgreen("%s..." % (_("Slot Search"),) )) @@ -1260,9 +1256,7 @@ def search_slotted_packages(slots, dbconn = None, Equo = None): print_info(blue(" #"+str(repo_number)) + \ bold(" " + Equo.SystemSettings['repositories']['available'][repo]['description'])) - if dbclose: - dbconn = Equo.open_repository(repo) - + dbconn = Equo.open_repository(repo) for slot in slots: results = dbconn.searchSlottedPackages(slot, atoms = True) @@ -1318,15 +1312,11 @@ def search_package_sets(items, Equo = None): return 0 -def search_tagged_packages(tags, dbconn = None, Equo = None): +def search_tagged_packages(tags, Equo = None): if Equo is None: Equo = EquoInterface() - dbclose = True - if dbconn: - dbclose = False - found = False if not etpUi['quiet']: print_info(darkred(" @@ ")+darkgreen("%s..." % (_("Tag Search"),))) @@ -1339,9 +1329,7 @@ def search_tagged_packages(tags, dbconn = None, Equo = None): print_info(blue(" #" + str(repo_number)) + \ bold(" " + Equo.SystemSettings['repositories']['available'][repo]['description'])) - if dbclose: - dbconn = Equo.open_repository(repo) - + dbconn = Equo.open_repository(repo) for tag in tags: results = dbconn.searchTaggedPackages(tag, atoms = True) found = True @@ -1361,15 +1349,11 @@ def search_tagged_packages(tags, dbconn = None, Equo = None): return 0 -def search_rev_packages(revisions, dbconn = None, Equo = None): +def search_rev_packages(revisions, Equo = None): if Equo is None: Equo = EquoInterface() - dbclose = True - if dbconn: - dbclose = False - found = False if not etpUi['quiet']: print_info(darkred(" @@ ")+darkgreen("%s..." % (_("Revision Search"),))) @@ -1382,9 +1366,7 @@ def search_rev_packages(revisions, dbconn = None, Equo = None): print_info(blue(" #" + str(repo_number)) + \ bold(" " + Equo.SystemSettings['repositories']['available'][repo]['description'])) - if dbclose: - dbconn = Equo.open_repository(repo) - + dbconn = Equo.open_repository(repo) for revision in revisions: results = dbconn.searchRevisionedPackages(revision) found = True @@ -1404,15 +1386,11 @@ def search_rev_packages(revisions, dbconn = None, Equo = None): return 0 -def search_licenses(licenses, dbconn = None, Equo = None): +def search_licenses(licenses, Equo = None): if Equo is None: Equo = EquoInterface() - dbclose = True - if dbconn: - dbclose = False - found = False if not etpUi['quiet']: print_info(darkred(" @@ ") + \ @@ -1427,8 +1405,7 @@ def search_licenses(licenses, dbconn = None, Equo = None): print_info(blue(" #" + str(repo_number)) + \ bold(" " + Equo.SystemSettings['repositories']['available'][repo]['description'])) - if dbclose: - dbconn = Equo.open_repository(repo) + dbconn = Equo.open_repository(repo) for mylicense in licenses: @@ -1486,7 +1463,8 @@ def search_descriptions(descriptions, dbconn, Equo = None): for desc in descriptions: result = dbconn.searchPackagesByDescription(desc) - if not result: continue + if not result: + continue mydescdata[desc] = result for pkg in mydescdata[desc]: