[meego-commits] 10919: Changes to Tools:Testing/python-ots-worker

[Timo Härkönen]

Hi,
I have made the following changes to python-ots-worker in project Tools:Testing. Please review and accept ASAP.

Thank You,
Timo Härkönen

[This message was auto-generated]

---

Request #10919:

  submit:   devel:quality/python-ots-worker(r12) -> Tools:Testing/python-ots-worker


Message:
    version 0.1.4 - Fixes BMC#11277

State:   new          2010-12-14T06:06:08 timoph
Comment: None



changes files:
--------------
--- python-ots-worker.changes
+++ python-ots-worker.changes
@@ -0,0 +1,3 @@
+* Tue 14 Nov 2010 Timo Härkönen <timo.harkonen at digia.com> 0.1.4
+- Update to 0.1.4
+

old:
----
  ots-worker-0.1.3.tar.gz

new:
----
  ots-worker-0.1.4.tar.gz

spec files:
-----------
--- python-ots-worker.spec
+++ python-ots-worker.spec
@@ -1,6 +1,6 @@
 Summary: OTS Worker
 Name: ots-worker
-Version: 0.1.3
+Version: 0.1.4
 Release: 1
 Source0: %{name}-%{version}.tar.gz
 License: LGPL 2.1

dsc files:
----------
--- python-ots-worker.dsc
+++ python-ots-worker.dsc
@@ -2,7 +2,7 @@
 Source: ots-worker
 Binary: python-ots-worker
 Architecture: all
-Version: 0.1.3
+Version: 0.1.4
 Maintainer: Teemu Vainio <ext-teemu.a.vainio at nokia.com>
 Standards-Version: 3.7.2
 Build-Depends: python-setuptools (>= 0.6b3), python-all-dev (>= 2.3.5-11), debhelper (>= 5.0.38), python-central (>= 0.5.6)

other changes:
--------------

++++++ debian.changelog
--- debian.changelog
+++ debian.changelog
@@ -1,3 +1,9 @@
+ots-worker (0.1.4-1) unstable; urgency=low
+
+  * XmlParser now only parses correct suite, set and case elements. Fixes compatibility problem with testrunner-lite 1.4.1 (BMC#11277)
+
+ -- Teemu Vainio <teemu.vainio at ixonos.com>  Tue, 14 Dec 2010 12:57:15 +0200
+
 ots-worker (0.1.3-1) unstable; urgency=low
 
   * multiple device properties

++++++ ots-worker-0.1.3.tar.gz -> ots-worker-0.1.4.tar.gz
--- setup.py
+++ setup.py
@@ -20,12 +20,21 @@
 # 02110-1301 USA
 # ***** END LICENCE BLOCK *****
 
+import os.path; j = os.path.join
+import sys
+
 from setuptools import setup, find_packages
 
+if sys.prefix.startswith("/usr") or sys.prefix == "/":
+    data_prefix="/" #install data and config files relative to root
+else:
+    data_prefix=sys.prefix #we are inside virtualenv, so install files relative to it
+    
+
 setup(
     name = "ots.worker",
     author = "teemu.vainio at ixonos.com",
-    version = "0.1.3",
+    version = "0.1.4",
     include_package_data = True,
     namespace_packages = ['ots'],
     packages = find_packages(),
@@ -35,6 +44,6 @@
                    "conductor = ots.worker.conductor.conductor:main",
                    # For backward compatibility:
                    "kickstart = ots.worker.conductor.conductor:main"]},
-    data_files=[('/etc', ['ots.ini', 'ots/worker/conductor/conductor.conf']),
-                ('/etc/conductor', [])]
+    data_files=[(j(data_prefix,'etc'), ['ots.ini', 'ots/worker/conductor/conductor.conf']),
+                (j(data_prefix,'etc/conductor'), [])]
     )