|
 |
3b4060b |
diff -up patool-upstream-1.12/patoolib/configuration.py.install__patool_configdata_in_private_namespace patool-upstream-1.12/patoolib/configuration.py
|
|
 |
3b4060b |
--- patool-upstream-1.12/patoolib/configuration.py.install__patool_configdata_in_private_namespace 2016-01-17 09:15:22.000000000 +0100
|
|
 |
3b4060b |
+++ patool-upstream-1.12/patoolib/configuration.py 2018-02-07 00:06:26.568893492 +0100
|
|
 |
3b4060b |
@@ -2,7 +2,7 @@
|
|
 |
3b4060b |
"""
|
|
 |
3b4060b |
Define basic configuration data like version or application name.
|
|
 |
3b4060b |
"""
|
|
 |
3b4060b |
-import _patool_configdata as configdata
|
|
 |
3b4060b |
+from patoolib import _patool_configdata as configdata
|
|
 |
3b4060b |
|
|
 |
3b4060b |
Version = configdata.version
|
|
 |
3b4060b |
ReleaseDate = configdata.release_date
|
|
 |
3b4060b |
diff -up patool-upstream-1.12/setup.py.install__patool_configdata_in_private_namespace patool-upstream-1.12/setup.py
|
|
 |
3b4060b |
--- patool-upstream-1.12/setup.py.install__patool_configdata_in_private_namespace 2016-01-17 09:15:22.000000000 +0100
|
|
 |
3b4060b |
+++ patool-upstream-1.12/setup.py 2018-02-07 00:16:19.425586537 +0100
|
|
 |
3b4060b |
@@ -79,7 +79,7 @@ class MyInstallLib (install_lib, object)
|
|
 |
3b4060b |
"""Install the generated config file."""
|
|
 |
3b4060b |
outs = super(MyInstallLib, self).install()
|
|
 |
3b4060b |
infile = self.create_conf_file()
|
|
 |
3b4060b |
- outfile = os.path.join(self.install_dir, os.path.basename(infile))
|
|
 |
3b4060b |
+ outfile = os.path.join(self.install_dir, "patoolib", os.path.basename(infile))
|
|
 |
3b4060b |
self.copy_file(infile, outfile)
|
|
 |
3b4060b |
outs.append(outfile)
|
|
 |
3b4060b |
return outs
|
|
 |
3b4060b |
@@ -152,7 +152,7 @@ class MyDistribution (Distribution, obje
|
|
 |
3b4060b |
|
|
 |
3b4060b |
def get_conf_filename (self, directory):
|
|
 |
3b4060b |
"""Get name for config file."""
|
|
 |
3b4060b |
- return os.path.join(directory, "_%s_configdata.py" % self.get_name())
|
|
 |
3b4060b |
+ return os.path.join(directory, "patoolib/", "_%s_configdata.py" % self.get_name())
|
|
 |
3b4060b |
|
|
 |
3b4060b |
def create_conf_file (self, data, directory=None):
|
|
 |
3b4060b |
"""Create local config file from given data (list of lines) in
|