almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

Close the rpmdb after every API operation.

Browse Source 
rpm blocks all of the signals until closeRpmDB() is called.
We need to call it after all of the API calls.
This commit is contained in:
Brian C. Lane 2017-11-27 15:16:09 -08:00
parent cf42e1a480
commit a44e499eee
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/pylorax/api/projects.py
View File

@ -158,6 +158,8 @@ def projects_list(yb):
ybl = yb.doPackageLists(pkgnarrow="available", showdups=False) ybl = yb.doPackageLists(pkgnarrow="available", showdups=False)
except YumBaseError as e: except YumBaseError as e:
raise ProjectsError("There was a problem listing projects: %s" % str(e)) raise ProjectsError("There was a problem listing projects: %s" % str(e))
finally:
yb.closeRpmDB()
return sorted(map(yaps_to_project, ybl.available), key=lambda p: p["name"].lower()) return sorted(map(yaps_to_project, ybl.available), key=lambda p: p["name"].lower())
@ -175,6 +177,8 @@ def projects_info(yb, project_names):
ybl = yb.doPackageLists(pkgnarrow="available", patterns=project_names, showdups=False) ybl = yb.doPackageLists(pkgnarrow="available", patterns=project_names, showdups=False)
except YumBaseError as e: except YumBaseError as e:
raise ProjectsError("There was a problem with info for %s: %s" % (project_names, str(e))) raise ProjectsError("There was a problem with info for %s: %s" % (project_names, str(e)))
finally:
yb.closeRpmDB()
return sorted(map(yaps_to_project_info, ybl.available), key=lambda p: p["name"].lower()) return sorted(map(yaps_to_project_info, ybl.available), key=lambda p: p["name"].lower())
@ -197,9 +201,12 @@ def projects_depsolve(yb, project_names):
if rc not in [1,2]: if rc not in [1,2]:
raise ProjectsError("There was a problem depsolving %s: %s" % (project_names, msg)) raise ProjectsError("There was a problem depsolving %s: %s" % (project_names, msg))
yb.tsInfo.makelists() yb.tsInfo.makelists()
deps = sorted(map(tm_to_dep, yb.tsInfo.installed + yb.tsInfo.depinstalled), key=lambda p: p["name"].lower())
except YumBaseError as e: except YumBaseError as e:
raise ProjectsError("There was a problem depsolving %s: %s" % (project_names, str(e))) raise ProjectsError("There was a problem depsolving %s: %s" % (project_names, str(e)))
return sorted(map(tm_to_dep, yb.tsInfo.installed + yb.tsInfo.depinstalled), key=lambda p: p["name"].lower()) finally:
yb.closeRpmDB()
return deps
def modules_list(yb, module_names): def modules_list(yb, module_names):
@ -221,6 +228,8 @@ def modules_list(yb, module_names):
ybl = yb.doPackageLists(pkgnarrow="available", patterns=module_names, showdups=False) ybl = yb.doPackageLists(pkgnarrow="available", patterns=module_names, showdups=False)
except YumBaseError as e: except YumBaseError as e:
raise ProjectsError("There was a problem listing modules: %s" % str(e)) raise ProjectsError("There was a problem listing modules: %s" % str(e))
finally:
yb.closeRpmDB()
return sorted(map(yaps_to_module, ybl.available), key=lambda p: p["name"].lower()) return sorted(map(yaps_to_module, ybl.available), key=lambda p: p["name"].lower())
@ -239,6 +248,8 @@ def modules_info(yb, module_names):
ybl = yb.doPackageLists(pkgnarrow="available", patterns=module_names, showdups=False) ybl = yb.doPackageLists(pkgnarrow="available", patterns=module_names, showdups=False)
except YumBaseError as e: except YumBaseError as e:
raise ProjectsError("There was a problem with info for %s: %s" % (module_names, str(e))) raise ProjectsError("There was a problem with info for %s: %s" % (module_names, str(e)))
finally:
yb.closeRpmDB()
modules = sorted(map(yaps_to_project, ybl.available), key=lambda p: p["name"].lower()) modules = sorted(map(yaps_to_project, ybl.available), key=lambda p: p["name"].lower())
# Add the dependency info to each one # Add the dependency info to each one