openlp/packaging
1
0
Fork 0
mirror of https://gitlab.com/openlp/packaging.git synced 2024-12-22 21:12:50 +00:00
Code Issues Projects Releases Wiki Activity

Revert some changes.

Browse Source
This commit is contained in:
Tomas Groth 2017-09-26 22:06:28 +02:00
parent 42741cbfb2
commit 9ae3703f76
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builders/builder.py
View File

@ -43,7 +43,7 @@ def _which(program):
Return absolute path to a command found on system PATH. Return absolute path to a command found on system PATH.
""" """
def is_exe(fpath): def is_exe(fpath):
return os.path.isfile(fpath) #and (os.access(fpath, os.X_OK) or fpath.endswith('.py')) return os.path.isfile(fpath) and os.access(fpath, os.X_OK)
fpath, fname = os.path.split(program) fpath, fname = os.path.split(program)
if fpath and is_exe(os.path.abspath(program)): if fpath and is_exe(os.path.abspath(program)):
@ -65,8 +65,8 @@ class Builder(object):
self.setup_args() self.setup_args()
self.setup_system_paths() self.setup_system_paths()
self.read_config() self.read_config()
self.setup_paths()
self.setup_executables() self.setup_executables()
self.setup_paths()
self.setup_extra() self.setup_extra()
def _print(self, text, *args): def _print(self, text, *args):
@ -189,7 +189,6 @@ class Builder(object):
self._print_verbose('Executables:') self._print_verbose('Executables:')
for executable in self.config.options('executables'): for executable in self.config.options('executables'):
path = self.config.get('executables', executable) path = self.config.get('executables', executable)
print(executable + " : " + path)
if not path.strip(): if not path.strip():
path = None path = None
else: else:
@ -204,7 +203,6 @@ class Builder(object):
self._print_verbose('Paths:') self._print_verbose('Paths:')
for name in self.config.options('paths'): for name in self.config.options('paths'):
path = os.path.abspath(self.config.get('paths', name)) path = os.path.abspath(self.config.get('paths', name))
print(name + " : " + path)
setattr(self, '{name}_path'.format(name=name), path) setattr(self, '{name}_path'.format(name=name), path)
self._print_verbose(' {name:.<20} {path}'.format(name=name + ': ', path=path)) self._print_verbose(' {name:.<20} {path}'.format(name=name + ': ', path=path))
# Make any command line options override the config file # Make any command line options override the config file