Force rpmdb clean termination on exit from python.

Python process tracebacking with active iterators can and will otherwise leave
stale locks around (as is presumably the reason for rhbz#235389 and various
other locking issues)

1 files changed, 17 insertions, 0 deletions

diff --git a/python/rpmmodule.c b/python/rpmmodule.c
index 85b6db257..9f6742e3c 100644
--- a/python/rpmmodule.c
+++ b/python/rpmmodule.c
@@ -227,6 +227,16 @@ static PyMethodDef rpmModuleMethods[] = {
     { NULL }
 } ;
 
+/*
+* Force clean up of open iterators and dbs on exit.
+* This ends up calling exit() while we're already exiting but exit
+* handlers will only get called once so it wont loop.
+*/
+static void rpm_exithook(void)
+{
+   rpmdbCheckTerminate(1);
+}
+
 /**
  */
 static char rpm__doc__[] =
@@ -265,6 +275,13 @@ void init_rpm(void)
     if (m == NULL)
 	return;
 
+    /* 
+     * treat error to register rpm cleanup hook as fatal, tracebacks
+     * can and will leave stale locks around if we can't clean up
+     */
+    if (Py_AtExit(rpm_exithook) == -1)
+	return;
+
     rpmReadConfigFiles(NULL, NULL);
 
     d = PyModule_GetDict(m);