From 2e2e588b4f27132e6f92e2e90906d0ecf39bc71d Mon Sep 17 00:00:00 2001
From: Michal Toman <mtoman@redhat.com>
Date: Mon, 28 Mar 2011 10:15:46 +0200
Subject: make abrt-retrace-server RPM work properly

---
 src/retrace/Makefile.am         | 11 +++++++++++
 src/retrace/create.wsgi         |  2 +-
 src/retrace/plugins/Makefile.am |  2 ++
 src/retrace/worker.py           |  6 +++++-
 4 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 src/retrace/plugins/Makefile.am

(limited to 'src')

diff --git a/src/retrace/Makefile.am b/src/retrace/Makefile.am
index 163f9e71..19971da9 100644
--- a/src/retrace/Makefile.am
+++ b/src/retrace/Makefile.am
@@ -1,9 +1,20 @@
+SUBDIRS = plugins
+
 bin_PROGRAMS = abrt-retrace-worker
 abrt_retrace_worker_SOURCES = worker.c
 
 retrace_PYTHON = retrace.py
 retracedir = $(datadir)/abrt-retrace
 
+worker_PYTHON = coredump2packages.py worker.py
+workerdir = $(datadir)/abrt-retrace
+
+cleanup_PYTHON = abrt-retrace-cleanup.py
+cleanupdir = $(datadir)/abrt-retrace
+
+reposync_PYTHON = abrt-retrace-reposync.py
+reposyncdir = $(datadir)/abrt-retrace
+
 interface_PYTHON = backtrace.wsgi create.wsgi log.wsgi status.wsgi
 # interfacedir should probably be $$(pkgdatadir)/retrace
 interfacedir =  $(datadir)/abrt-retrace
diff --git a/src/retrace/create.wsgi b/src/retrace/create.wsgi
index 914469ec..35549068 100644
--- a/src/retrace/create.wsgi
+++ b/src/retrace/create.wsgi
@@ -91,6 +91,6 @@ def application(environ, start_response):
             Popen(["rm", "-rf", taskdir])
             return response(start_response, "403 Forbidden", "Required file \"{0}\" is missing".format(required_file))
 
-    Popen(["/usr/sbin/abrt-retrace-worker", "%d" % taskid])
+    Popen(["/usr/bin/abrt-retrace-worker", "%d" % taskid])
 
     return response(start_response, "201 Created", "", [("X-Task-Id", "%d" % taskid), ("X-Task-Password", taskpass)])
diff --git a/src/retrace/plugins/Makefile.am b/src/retrace/plugins/Makefile.am
new file mode 100644
index 00000000..251efbff
--- /dev/null
+++ b/src/retrace/plugins/Makefile.am
@@ -0,0 +1,2 @@
+plugins_PYTHON = __init__.py fedora.py
+pluginsdir = $(datadir)/abrt-retrace/plugins
diff --git a/src/retrace/worker.py b/src/retrace/worker.py
index 4eed5236..5102315e 100755
--- a/src/retrace/worker.py
+++ b/src/retrace/worker.py
@@ -125,7 +125,11 @@ if __name__ == "__main__":
     # read required packages from coredump
     try:
         # ToDo: deal with not found build-ids
-        pipe = Popen(["/usr/share/abrt-retrace/coredump2packages.py", "%s/crash/coredump" % savedir, "--repos=retrace-%s-%s-%s*" % (distribution, version, arch)], stdout=PIPE).stdout
+        pipe = Popen(["/usr/bin/python",
+                      "/usr/share/abrt-retrace/coredump2packages.py",
+                      "%s/crash/coredump" % savedir,
+                      "--repos=retrace-%s-%s-%s*" % (distribution, version, arch)],
+                     stdout=PIPE).stdout
         section = 0
         crash_package_or_component = None
         for line in pipe.readlines():
-- 
cgit