Miroirs/slpkg
1
0
Fork 0
mirror of https://gitlab.com/dslackw/slpkg.git synced 2025-01-30 20:34:38 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix fails install if modified OUTPUT variable

Browse source
This commit is contained in:
Dimitris Zlatanidis 2015-01-27 05:02:39 +02:00
parent 768f3a5aa9
commit 9efa62e0f5
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
slpkg/__metadata__.py
View file

@ -212,3 +212,11 @@ class MetaData(object):
# computer architecture # computer architecture
arch = os.uname()[4] arch = os.uname()[4]
# get sbo OUTPUT enviroment variable
try:
output = os.environ['OUTPUT']
except KeyError:
output = tmp
if not output.endswith('/'):
output = output + '/'

4
slpkg/sbo/slackbuild.py
View file

@ -300,7 +300,7 @@ class SBoInstall(object):
Search for binary packages in /tmp directory Search for binary packages in /tmp directory
''' '''
binary = [] binary = []
for search in find_package(prgnam, _m.tmp): for search in find_package(prgnam, _m.output):
if "_SBo" in search: if "_SBo" in search:
binary.append(search) binary.append(search)
return binary return binary
@ -342,7 +342,7 @@ class SBoInstall(object):
BuildPackage(script, sources, _m.build_path).build() BuildPackage(script, sources, _m.build_path).build()
binary_list = self.search_in_tmp(prgnam) binary_list = self.search_in_tmp(prgnam)
try: try:
binary = (_m.tmp + max(binary_list)).split() binary = (_m.output + max(binary_list)).split()
except ValueError: except ValueError:
build_FAILED(sbo_url, prgnam) build_FAILED(sbo_url, prgnam)
sys.exit(0) sys.exit(0)

4
slpkg/sbo/views.py
View file

@ -213,11 +213,11 @@ class SBoNetwork(object):
directory. directory.
''' '''
binary_list = [] binary_list = []
for search in find_package(prgnam, _m.tmp): for search in find_package(prgnam, _m.output):
if "_SBo" in search: if "_SBo" in search:
binary_list.append(search) binary_list.append(search)
try: try:
binary = (_m.tmp + max(binary_list)).split() binary = (_m.output + max(binary_list)).split()
except ValueError: except ValueError:
build_FAILED(self.sbo_url, prgnam) build_FAILED(self.sbo_url, prgnam)
sys.exit(0) sys.exit(0)