retrace server: do not require 'uid' file, accept 'release' or 'os_release' file

2 files changed, 18 insertions, 2 deletions

diff --git a/src/retrace/retrace.py b/src/retrace/retrace.py
index 1c741ec7..08acfb89 100644
--- a/src/retrace/retrace.py
+++ b/src/retrace/retrace.py
@@ -8,7 +8,7 @@ import sqlite3
 from webob import Request
 from subprocess import *
 
-REQUIRED_FILES = ["architecture", "coredump", "release"]
+REQUIRED_FILES = ["architecture", "coredump", "executable", "package"]
 
 DF_BIN = "/bin/df"
 DU_BIN = "/usr/bin/du"
diff --git a/src/retrace/worker.py b/src/retrace/worker.py
index 06fa609a..9b04b799 100755
--- a/src/retrace/worker.py
+++ b/src/retrace/worker.py
@@ -75,8 +75,12 @@ if __name__ == "__main__":
         repoarch = "i386"
 
     # read release, distribution and version from release file
+    release_path = "%s/crash/os_release" % savedir
+    if not os.path.isfile(release_path):
+        release_path = "%s/crash/release" % savedir
+
     try:
-        release_file = open("%s/crash/release" % savedir, "r")
+        release_file = open(release_path, "r")
         release = release_file.read()
         release_file.close()
     except Exception as ex:
@@ -212,6 +216,18 @@ if __name__ == "__main__":
     retrace_run(26, ["mock", "-r", mockr, "--copyin", "%s/crash" % savedir, "/var/spool/abrt/crash"])
     retrace_run(27, ["touch", "%s/chroot/root/var/spool/abrt/crash/time" % workdir])
 
+    # if uid file is not present, create it
+    uidpath = "%s/chroot/root/var/spool/abrt/crash/uid" % workdir;
+    if not os.path.isfile(uidpath):
+        try:
+            uid = open(uidpath, "w")
+            uid.write("500")
+            uid.close()
+        except:
+            LOG.write("Unable to create uid file.\n")
+            LOG.close()
+            sys.exit(28)
+
     LOG.write("OK\n")
 
     try: