Miroirs/slpkg
1
0
Fork 0
mirror of https://gitlab.com/dslackw/slpkg.git synced 2024-12-28 09:58:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update find package

Browse source
This commit is contained in:
Dimitris Zlatanidis 2015-10-03 13:04:05 +03:00
parent ca7c1d6fd7
commit 1327fbafae
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
slpkg/sbo/network.py
View file

@ -226,8 +226,7 @@ class SBoNetwork(object):
def choice_install(self):
"""Download, build and install package
"""
if not find_package(self.prgnam + self.meta.sp,
self.meta.pkg_path):
if not find_package(self.prgnam, self.meta.pkg_path):
self.build()
self.install()
delete(self.build_folder)

2
slpkg/sbo/queue.py
View file

@ -159,7 +159,7 @@ class QueuePkgs(object):
for pkg in packages:
ver = SBoGrep(pkg).version()
prgnam = "{0}-{1}".format(pkg, ver)
if find_package(prgnam + self.meta.sp, self.meta.output):
if find_package(prgnam, self.meta.output):
binary = slack_package(prgnam)
PackageManager(binary).upgrade(flag="--install-new")
else:

3
slpkg/sbo/slackbuild.py
View file

@ -299,8 +299,7 @@ class SBoInstall(object):
os.chdir(self.build_folder)
for prgnam in slackbuilds:
pkg = "-".join(prgnam.split("-")[:-1])
installed = "".join(find_package(prgnam + self.meta.sp,
self.meta.pkg_path))
installed = "".join(find_package(prgnam, self.meta.pkg_path))
src_link = SBoGrep(pkg).source().split()
if installed:
self.msg.template(78)