Miroirs/slpkg
1
0
Fork 0
mirror of https://gitlab.com/dslackw/slpkg.git synced 2025-01-18 10:26:29 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix continue install sbo packages if death link

Browse source
This commit is contained in:
Dimitris Zlatanidis 2016-02-17 06:18:42 +02:00
parent 2720963730
commit 154923165f
3 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
slpkg/pkg/build.py
View file

@ -79,6 +79,8 @@ class BuildPackage(object):
if not self.auto: if not self.auto:
os.chdir(self._SOURCES) os.chdir(self._SOURCES)
for src in self.sources: for src in self.sources:
if not os.path.isfile(src):
continue
# fix build sources with spaces # fix build sources with spaces
src = src.replace("%20", " ") src = src.replace("%20", " ")
check_md5(self.sbo_md5[src], src) check_md5(self.sbo_md5[src], src)

2
slpkg/sbo/slack_find.py
View file

@ -43,5 +43,5 @@ def slack_package(prgnam):
cache = binary cache = binary
if not binary: if not binary:
Msg().build_FAILED(prgnam) Msg().build_FAILED(prgnam)
raise SystemExit() # raise SystemExit()
return ["".join(_meta_.output + binary)] return ["".join(_meta_.output + binary)]

1
slpkg/sbo/slackbuild.py
View file

@ -335,6 +335,7 @@ class SBoInstall(object):
BuildPackage(script, sources, self.build_folder, BuildPackage(script, sources, self.build_folder,
auto=False).build() auto=False).build()
binary = slack_package(prgnam) binary = slack_package(prgnam)
if os.path.isfile("".join(binary)):
if GetFromInstalled(pkg).name() == pkg: if GetFromInstalled(pkg).name() == pkg:
print("[ {0}Upgrading{1} ] --> {2}".format( print("[ {0}Upgrading{1} ] --> {2}".format(
self.meta.color["YELLOW"], self.meta.color["YELLOW"],