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