Matej Habrnal 6ea6b8
From 715fcfb5d83faa29f8d221d0e2d800b08261810a Mon Sep 17 00:00:00 2001
Matej Habrnal 6ea6b8
From: Matej Habrnal <mhabrnal@redhat.com>
Matej Habrnal 6ea6b8
Date: Tue, 8 Mar 2016 16:42:31 +0100
Matej Habrnal 6ea6b8
Subject: [PATCH] a-a-install-debuginfo: make tmpdir variable global
Matej Habrnal 6ea6b8
Matej Habrnal 6ea6b8
Function clean_up() has one required parameter tmpdir.
Matej Habrnal 6ea6b8
Without this commit clean_up() function raises an exception because it was
Matej Habrnal 6ea6b8
called without the parameter.
Matej Habrnal 6ea6b8
Matej Habrnal 6ea6b8
Signed-off-by: Matej Habrnal <mhabrnal@redhat.com>
Matej Habrnal 6ea6b8
---
Matej Habrnal 6ea6b8
 src/plugins/abrt-action-install-debuginfo.in | 16 ++++++++--------
Matej Habrnal 6ea6b8
 1 file changed, 8 insertions(+), 8 deletions(-)
Matej Habrnal 6ea6b8
Matej Habrnal 6ea6b8
diff --git a/src/plugins/abrt-action-install-debuginfo.in b/src/plugins/abrt-action-install-debuginfo.in
Matej Habrnal 6ea6b8
index f70ebcd..7818ffd 100644
Matej Habrnal 6ea6b8
--- a/src/plugins/abrt-action-install-debuginfo.in
Matej Habrnal 6ea6b8
+++ b/src/plugins/abrt-action-install-debuginfo.in
Matej Habrnal 6ea6b8
@@ -20,7 +20,8 @@ import problem
Matej Habrnal 6ea6b8
 RETURN_OK = 0
Matej Habrnal 6ea6b8
 # serious problem, should be logged somewhere
Matej Habrnal 6ea6b8
 RETURN_FAILURE = 2
Matej Habrnal 6ea6b8
-
Matej Habrnal 6ea6b8
+# path to tmp directory has to be global because of clean_up()
Matej Habrnal 6ea6b8
+TMPDIR = None
Matej Habrnal 6ea6b8
 
Matej Habrnal 6ea6b8
 GETTEXT_PROGNAME = "abrt"
Matej Habrnal 6ea6b8
 import locale
Matej Habrnal 6ea6b8
@@ -43,11 +44,11 @@ def init_gettext():
Matej Habrnal 6ea6b8
     gettext.textdomain(GETTEXT_PROGNAME)
Matej Habrnal 6ea6b8
 
Matej Habrnal 6ea6b8
 def sigterm_handler(signum, frame):
Matej Habrnal 6ea6b8
-    clean_up()
Matej Habrnal 6ea6b8
+    clean_up(TMPDIR)
Matej Habrnal 6ea6b8
     exit(RETURN_OK)
Matej Habrnal 6ea6b8
 
Matej Habrnal 6ea6b8
 def sigint_handler(signum, frame):
Matej Habrnal 6ea6b8
-    clean_up()
Matej Habrnal 6ea6b8
+    clean_up(TMPDIR)
Matej Habrnal 6ea6b8
     print("\n{0}".format(_("Exiting on user command")))
Matej Habrnal 6ea6b8
     sys.stdout.flush()
Matej Habrnal 6ea6b8
     # ??! without "sys.", I am getting segv!
Matej Habrnal 6ea6b8
@@ -63,7 +64,6 @@ if __name__ == "__main__":
Matej Habrnal 6ea6b8
     fbuild_ids = "build_ids"
Matej Habrnal 6ea6b8
     cachedirs = []
Matej Habrnal 6ea6b8
     size_mb = 4096
Matej Habrnal 6ea6b8
-    tmpdir = None
Matej Habrnal 6ea6b8
     keeprpms = False
Matej Habrnal 6ea6b8
     noninteractive = False
Matej Habrnal 6ea6b8
     b_ids = []
Matej Habrnal 6ea6b8
@@ -135,7 +135,7 @@ if __name__ == "__main__":
Matej Habrnal 6ea6b8
             except:
Matej Habrnal 6ea6b8
                 pass
Matej Habrnal 6ea6b8
         elif opt == "--tmpdir":
Matej Habrnal 6ea6b8
-            tmpdir = arg
Matej Habrnal 6ea6b8
+            TMPDIR = arg
Matej Habrnal 6ea6b8
         elif opt == "--keeprpms":
Matej Habrnal 6ea6b8
             keeprpms = True
Matej Habrnal 6ea6b8
         # --exact takes precendece over --ids
Matej Habrnal 6ea6b8
@@ -159,11 +159,11 @@ if __name__ == "__main__":
Matej Habrnal 6ea6b8
 
Matej Habrnal 6ea6b8
         if not cachedirs:
Matej Habrnal 6ea6b8
             cachedirs = ["/var/cache/abrt-di"]
Matej Habrnal 6ea6b8
-    if not tmpdir:
Matej Habrnal 6ea6b8
+    if not TMPDIR:
Matej Habrnal 6ea6b8
         # security people prefer temp subdirs in app's private dir, like /var/run/abrt
Matej Habrnal 6ea6b8
         # and we switched to /tmp but Fedora feature tmp-on-tmpfs appeared, hence we must
Matej Habrnal 6ea6b8
         # not use /tmp for potential big data anymore
Matej Habrnal 6ea6b8
-        tmpdir = "@LARGE_DATA_TMP_DIR@/abrt-tmp-debuginfo-%s.%u" % (time.strftime("%Y-%m-%d-%H:%M:%S"), os.getpid())
Matej Habrnal 6ea6b8
+        TMPDIR = "@LARGE_DATA_TMP_DIR@/abrt-tmp-debuginfo-%s.%u" % (time.strftime("%Y-%m-%d-%H:%M:%S"), os.getpid())
Matej Habrnal 6ea6b8
 
Matej Habrnal 6ea6b8
 
Matej Habrnal 6ea6b8
     if missing == None:
Matej Habrnal 6ea6b8
@@ -235,7 +235,7 @@ if __name__ == "__main__":
Matej Habrnal 6ea6b8
             sys.exit(RETURN_FAILURE)
Matej Habrnal 6ea6b8
 
Matej Habrnal 6ea6b8
         # TODO: should we pass keep_rpms=keeprpms to DebugInfoDownload here??
Matej Habrnal 6ea6b8
-        downloader = download_class(cache=cachedirs[0], tmp=tmpdir,
Matej Habrnal 6ea6b8
+        downloader = download_class(cache=cachedirs[0], tmp=TMPDIR,
Matej Habrnal 6ea6b8
                                     noninteractive=noninteractive,
Matej Habrnal 6ea6b8
                                     repo_pattern=repo_pattern)
Matej Habrnal 6ea6b8
         try:
Matej Habrnal 6ea6b8
-- 
Matej Habrnal 6ea6b8
2.5.5
Matej Habrnal 6ea6b8