fixes for s/release/os_release/g change

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>

2 files changed, 11 insertions, 1 deletions

diff --git a/src/daemon/MiddleWare.cpp b/src/daemon/MiddleWare.cpp
index cdb5c072..7e3f3db4 100644
--- a/src/daemon/MiddleWare.cpp
+++ b/src/daemon/MiddleWare.cpp
@@ -63,10 +63,16 @@ static crash_data_t *DebugDumpToCrashReport(const char *dump_dir_name)
     {
         if (!dd_exist(dd, *v))
         {
+            /* Old dump dir format compat. Remove in abrt-2.1 */
+            if (strcmp(*v, FILENAME_OS_RELEASE) == 0)
+                if (dd_exist(dd, "release"))
+                    goto ok;
+
             dd_close(dd);
             log("Important file '%s/%s' is missing", dump_dir_name, *v);
             return NULL;
         }
+ ok:
         v++;
     }
 
diff --git a/src/gui/CCDump.py b/src/gui/CCDump.py
index f29fec6c..10d7c2a3 100644
--- a/src/gui/CCDump.py
+++ b/src/gui/CCDump.py
@@ -128,7 +128,11 @@ class Dump():
         return self.analyzer
 
     def get_release(self):
-        return self.release
+        # Old dump dir format compat. Delete in abrt-2.1:
+        try:
+            return self.os_release
+        except AttributeError:
+            return self.release # old name
 
     def get_reason(self):
         return self.reason