From 5fc9bc34ef7b0367e376e9bac29b6f6ed29beaca Mon Sep 17 00:00:00 2001
From: Michal Toman <mtoman@redhat.com>
Date: Tue, 19 Apr 2011 10:27:31 +0200
Subject: retrace server: move retrace library to %{python_site}

---
 src/retrace/Makefile.am           | 3 +--
 src/retrace/abrt-retrace-reposync | 3 +++
 src/retrace/backtrace.wsgi        | 3 ---
 src/retrace/create.wsgi           | 3 ---
 src/retrace/log.wsgi              | 3 ---
 src/retrace/plugins/fedora.py     | 4 ++--
 src/retrace/retrace.py            | 1 -
 src/retrace/settings.wsgi         | 3 ---
 src/retrace/status.wsgi           | 3 ---
 src/retrace/worker.py             | 3 +++
 10 files changed, 9 insertions(+), 20 deletions(-)

(limited to 'src')

diff --git a/src/retrace/Makefile.am b/src/retrace/Makefile.am
index b67195df..684d0f5a 100644
--- a/src/retrace/Makefile.am
+++ b/src/retrace/Makefile.am
@@ -5,8 +5,7 @@ abrt_retrace_worker_SOURCES = worker.c
 
 dist_bin_SCRIPTS = abrt-retrace-cleanup abrt-retrace-reposync coredump2packages
 
-retrace_PYTHON = retrace.py
-retracedir = $(datadir)/abrt-retrace
+python_PYTHON = retrace.py
 
 worker_PYTHON = worker.py
 workerdir = $(datadir)/abrt-retrace
diff --git a/src/retrace/abrt-retrace-reposync b/src/retrace/abrt-retrace-reposync
index 3f87d831..30b437f2 100755
--- a/src/retrace/abrt-retrace-reposync
+++ b/src/retrace/abrt-retrace-reposync
@@ -6,6 +6,9 @@ import pwd
 import sys
 from retrace import *
 
+sys.path = ["/usr/share/abrt-retrace"] + sys.path
+from plugins import *
+
 TARGET_USER = "abrt"
 
 if __name__ == "__main__":
diff --git a/src/retrace/backtrace.wsgi b/src/retrace/backtrace.wsgi
index d6a8686a..2074d157 100644
--- a/src/retrace/backtrace.wsgi
+++ b/src/retrace/backtrace.wsgi
@@ -1,8 +1,5 @@
 #!/usr/bin/python
 
-import sys
-sys.path = ["/usr/share/abrt-retrace"] + sys.path
-
 from retrace import *
 
 def application(environ, start_response):
diff --git a/src/retrace/create.wsgi b/src/retrace/create.wsgi
index 35549068..8593ed80 100644
--- a/src/retrace/create.wsgi
+++ b/src/retrace/create.wsgi
@@ -1,8 +1,5 @@
 #!/usr/bin/python
 
-import sys
-sys.path = ["/usr/share/abrt-retrace"] + sys.path
-
 from retrace import *
 from tempfile import *
 
diff --git a/src/retrace/log.wsgi b/src/retrace/log.wsgi
index bc20a98b..ab9b31a3 100644
--- a/src/retrace/log.wsgi
+++ b/src/retrace/log.wsgi
@@ -1,8 +1,5 @@
 #!/usr/bin/python
 
-import sys
-sys.path = ["/usr/share/abrt-retrace"] + sys.path
-
 from retrace import *
 
 def application(environ, start_response):
diff --git a/src/retrace/plugins/fedora.py b/src/retrace/plugins/fedora.py
index d4b43fc7..6bf2f7b9 100644
--- a/src/retrace/plugins/fedora.py
+++ b/src/retrace/plugins/fedora.py
@@ -8,11 +8,11 @@ guessparser = re.compile("\.fc([0-9]+)")
 repos = [
   [
     "rsync://ftp.sh.cvut.cz/fedora/linux/releases/$VER/Everything/$ARCH/os/Packages/*",
-    "rsync://ftp.sh.cvut.cz/fedora/linux/development/$VER/Everything/$ARCH/os/Packages/*",
+    "rsync://ftp.sh.cvut.cz/fedora/linux/development/$VER/$ARCH/os/Packages/*",
   ],
   [
     "rsync://ftp.sh.cvut.cz/fedora/linux/releases/$VER/Everything/$ARCH/debug/*",
-    "rsync://ftp.sh.cvut.cz/fedora/linux/development/$VER/Everything/$ARCH/debug/*",
+    "rsync://ftp.sh.cvut.cz/fedora/linux/development/$VER/$ARCH/debug/*",
   ],
   [
     "rsync://ftp.sh.cvut.cz/fedora/linux/updates/$VER/$ARCH/*",
diff --git a/src/retrace/retrace.py b/src/retrace/retrace.py
index 28033619..39588d90 100644
--- a/src/retrace/retrace.py
+++ b/src/retrace/retrace.py
@@ -5,7 +5,6 @@ import re
 import ConfigParser
 import random
 import sqlite3
-from plugins import *
 from webob import Request
 from subprocess import *
 
diff --git a/src/retrace/settings.wsgi b/src/retrace/settings.wsgi
index 9b5c7e7d..9c906c49 100644
--- a/src/retrace/settings.wsgi
+++ b/src/retrace/settings.wsgi
@@ -1,8 +1,5 @@
 #!/usr/bin/python
 
-import sys
-sys.path = ["/usr/share/abrt-retrace"] + sys.path
-
 from retrace import *
 
 def application(environ, start_response):
diff --git a/src/retrace/status.wsgi b/src/retrace/status.wsgi
index 437d15ed..1e5bdf66 100644
--- a/src/retrace/status.wsgi
+++ b/src/retrace/status.wsgi
@@ -1,8 +1,5 @@
 #!/usr/bin/python
 
-import sys
-sys.path = ["/usr/share/abrt-retrace"] + sys.path
-
 from retrace import *
 
 def application(environ, start_response):
diff --git a/src/retrace/worker.py b/src/retrace/worker.py
index 47ef5685..ad2badf1 100755
--- a/src/retrace/worker.py
+++ b/src/retrace/worker.py
@@ -4,6 +4,9 @@ import sys
 import time
 from retrace import *
 
+sys.path = ["/usr/share/abrt-retrace/"] + sys.path
+from plugins import *
+
 LOG = None
 taskid = None
 
-- 
cgit