diff --git a/slpkg/pkg/build.py b/slpkg/pkg/build.py index b784814b..0bdeebf2 100644 --- a/slpkg/pkg/build.py +++ b/slpkg/pkg/build.py @@ -79,6 +79,8 @@ class BuildPackage(object): if not self.auto: os.chdir(self._SOURCES) for src in self.sources: + if not os.path.isfile(src): + continue # fix build sources with spaces src = src.replace("%20", " ") check_md5(self.sbo_md5[src], src) diff --git a/slpkg/sbo/slack_find.py b/slpkg/sbo/slack_find.py index ec46879d..54e5565a 100644 --- a/slpkg/sbo/slack_find.py +++ b/slpkg/sbo/slack_find.py @@ -43,5 +43,5 @@ def slack_package(prgnam): cache = binary if not binary: Msg().build_FAILED(prgnam) - raise SystemExit() + # raise SystemExit() return ["".join(_meta_.output + binary)] diff --git a/slpkg/sbo/slackbuild.py b/slpkg/sbo/slackbuild.py index e262e840..953e9f6c 100644 --- a/slpkg/sbo/slackbuild.py +++ b/slpkg/sbo/slackbuild.py @@ -335,15 +335,16 @@ class SBoInstall(object): BuildPackage(script, sources, self.build_folder, auto=False).build() binary = slack_package(prgnam) - if GetFromInstalled(pkg).name() == pkg: - print("[ {0}Upgrading{1} ] --> {2}".format( - self.meta.color["YELLOW"], - self.meta.color["ENDC"], prgnam)) - upgraded.append(prgnam) - else: - print("[ {0}Installing{1} ] --> {2}".format( - self.meta.color["GREEN"], - self.meta.color["ENDC"], prgnam)) - installs.append(prgnam) - PackageManager(binary).upgrade(flag="--install-new") + if os.path.isfile("".join(binary)): + if GetFromInstalled(pkg).name() == pkg: + print("[ {0}Upgrading{1} ] --> {2}".format( + self.meta.color["YELLOW"], + self.meta.color["ENDC"], prgnam)) + upgraded.append(prgnam) + else: + print("[ {0}Installing{1} ] --> {2}".format( + self.meta.color["GREEN"], + self.meta.color["ENDC"], prgnam)) + installs.append(prgnam) + PackageManager(binary).upgrade(flag="--install-new") return installs, upgraded