1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
Author: Pierre Gruet <pgt@debian.org>
Last-Update: 2021-09-28
Forwarded: https://github.com/TeraTrees/TIPP/issues/3
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,7 @@
from setuptools import find_packages
from distutils.core import setup, Command
from distutils.spawn import find_executable
-import sepp
+import tipp
use_setuptools(version="0.6.24")
version = "1.1.0"
@@ -36,8 +36,8 @@
def get_tools_dir(where):
path = os.path.join(os.getcwd(), "tools", where)
- if not os.path.exists(path):
- raise OSError("TIPP does not bundle tippJsonMerger for '%s' at this time!" )
+# if not os.path.exists(path):
+# raise OSError("TIPP does not bundle tippJsonMerger for '%s' at this time!" )
return path
@@ -57,7 +57,7 @@
"manner or on user's home"))]
def initopts(self):
- self.contained = None
+ self.contained = True
self.configfile = None
self.basepath = None
@@ -140,8 +140,7 @@
def run(self):
## We are going to read sepp config file and write it here
- root_p = open(os.path.join(os.path.split(os.path.split(sepp.__file__)[0])[0], "home.path")).readlines()[0].strip()
- sepp_config_path = os.path.join(root_p, "main.config")
+ sepp_config_path = "/etc/sepp/sepp.config"
# Create the default config file
if not os.path.exists(self.basepath):
@@ -154,7 +153,7 @@
#This is not needed as we are reading sepp config and not default config distributed with
# l3 = l3.replace("~", self.get_tools_dest())
if (l3.find('seppJsonMerger.jar') != -1):
- l3 = "path="+self.get_tools_dest()+'/tippJsonMerger.jar\n'
+ l3 = 'path=/usr/share/tipp/tippJsonMerger.jar\n'
d.write(l3)
if not os.getenv('SATE') is None:
d.write('\n[sate]\npath=%s' % os.getenv('SATE'))
|
