Matej Habrnal 0b651c
From d92ce50f162e0e4defeb99a5cf35941b382ba3d7 Mon Sep 17 00:00:00 2001
Matej Habrnal 0b651c
From: Jakub Filak <jfilak@redhat.com>
Matej Habrnal 0b651c
Date: Thu, 27 Nov 2014 14:30:48 +0100
Matej Habrnal 0b651c
Subject: [PATCH] vmcore: remove original vmcore file in the last step
Matej Habrnal 0b651c
Matej Habrnal 0b651c
Signed-off-by: Jakub Filak <jfilak@redhat.com>
Matej Habrnal 0b651c
---
Matej Habrnal 0b651c
 src/hooks/abrt_harvest_vmcore.py.in | 12 ++++++------
Matej Habrnal 0b651c
 1 file changed, 6 insertions(+), 6 deletions(-)
Matej Habrnal 0b651c
Matej Habrnal 0b651c
diff --git a/src/hooks/abrt_harvest_vmcore.py.in b/src/hooks/abrt_harvest_vmcore.py.in
Matej Habrnal 0b651c
index c6a7e6b..256f8f1 100644
Matej Habrnal 0b651c
--- a/src/hooks/abrt_harvest_vmcore.py.in
Matej Habrnal 0b651c
+++ b/src/hooks/abrt_harvest_vmcore.py.in
Matej Habrnal 0b651c
@@ -266,12 +266,6 @@ def harvest_vmcore():
Matej Habrnal 0b651c
             shutil.rmtree(destdirnew)
Matej Habrnal 0b651c
             continue
Matej Habrnal 0b651c
 
Matej Habrnal 0b651c
-        if copyvmcore == 'no':
Matej Habrnal 0b651c
-            try:
Matej Habrnal 0b651c
-                shutil.rmtree(f_full)
Matej Habrnal 0b651c
-            except OSError:
Matej Habrnal 0b651c
-                sys.stderr.write("Unable to delete '%s'. Ignoring\n" % f_full)
Matej Habrnal 0b651c
-
Matej Habrnal 0b651c
         try:
Matej Habrnal 0b651c
             # Let abrtd know what type of problem it is:
Matej Habrnal 0b651c
             create_abrtd_info(destdirnew)
Matej Habrnal 0b651c
@@ -291,6 +285,12 @@ def harvest_vmcore():
Matej Habrnal 0b651c
         # Get rid of  the .new suffix
Matej Habrnal 0b651c
         shutil.move(destdirnew, destdir)
Matej Habrnal 0b651c
 
Matej Habrnal 0b651c
+        if copyvmcore == 'no':
Matej Habrnal 0b651c
+            try:
Matej Habrnal 0b651c
+                shutil.rmtree(f_full)
Matej Habrnal 0b651c
+            except OSError:
Matej Habrnal 0b651c
+                sys.stderr.write("Unable to delete '%s'. Ignoring\n" % f_full)
Matej Habrnal 0b651c
+
Matej Habrnal 0b651c
         problem.notify_new_path(destdir)
Matej Habrnal 0b651c
 
Matej Habrnal 0b651c
 
Matej Habrnal 0b651c
-- 
Matej Habrnal 0b651c
1.9.3
Matej Habrnal 0b651c