mirror of
https://gitlab.com/dslackw/slpkg.git
synced 2025-01-30 20:34:38 +01:00
fix search packages
This commit is contained in:
parent
dbd8c7a52b
commit
423d3ebd16
1 changed files with 4 additions and 4 deletions
|
@ -99,7 +99,7 @@ def sbo_build(name):
|
||||||
elif "UNTESTED" in src:
|
elif "UNTESTED" in src:
|
||||||
pkg_arch.append("UNTESTED")
|
pkg_arch.append("UNTESTED")
|
||||||
sbo_pkg = ("{0}-{1}".format(pkg, version))
|
sbo_pkg = ("{0}-{1}".format(pkg, version))
|
||||||
if find_package(sbo_pkg + sp, pkg_path):
|
if find_package(sbo_pkg, pkg_path):
|
||||||
pkg_sum += 1
|
pkg_sum += 1
|
||||||
sys.stdout.write("Done\n")
|
sys.stdout.write("Done\n")
|
||||||
'''
|
'''
|
||||||
|
@ -109,7 +109,7 @@ def sbo_build(name):
|
||||||
UNTESTED with color yellow.
|
UNTESTED with color yellow.
|
||||||
'''
|
'''
|
||||||
master_pkg = ("{0}-{1}".format(name, sbo_ver[-1]))
|
master_pkg = ("{0}-{1}".format(name, sbo_ver[-1]))
|
||||||
if find_package(master_pkg + sp, pkg_path):
|
if find_package(master_pkg, pkg_path):
|
||||||
PKG_COLOR = colors.GREEN
|
PKG_COLOR = colors.GREEN
|
||||||
else:
|
else:
|
||||||
PKG_COLOR = colors.RED
|
PKG_COLOR = colors.RED
|
||||||
|
@ -131,7 +131,7 @@ def sbo_build(name):
|
||||||
ARCH_COLOR = "" # reset arch color for dependencies packages
|
ARCH_COLOR = "" # reset arch color for dependencies packages
|
||||||
for dep, ver, dep_arch in zip(dependencies[:-1], sbo_ver[:-1], pkg_arch[:-1]):
|
for dep, ver, dep_arch in zip(dependencies[:-1], sbo_ver[:-1], pkg_arch[:-1]):
|
||||||
dep_pkg = ("{0}-{1}".format(dep, ver))
|
dep_pkg = ("{0}-{1}".format(dep, ver))
|
||||||
if find_package(dep_pkg + sp, pkg_path):
|
if find_package(dep_pkg, pkg_path):
|
||||||
DEP_COLOR = colors.GREEN
|
DEP_COLOR = colors.GREEN
|
||||||
else:
|
else:
|
||||||
DEP_COLOR = colors.RED
|
DEP_COLOR = colors.RED
|
||||||
|
@ -160,7 +160,7 @@ def sbo_build(name):
|
||||||
os.mkdir(build_path)
|
os.mkdir(build_path)
|
||||||
os.chdir(build_path)
|
os.chdir(build_path)
|
||||||
for pkg, ver in zip(dependencies, sbo_ver):
|
for pkg, ver in zip(dependencies, sbo_ver):
|
||||||
sbo_file = "".join(find_package(pkg + sp, pkg_path))
|
sbo_file = "".join(find_package(pkg, pkg_path))
|
||||||
sbo_file_version = sbo_file[len(pkg) + 1:-len(arch) - 7]
|
sbo_file_version = sbo_file[len(pkg) + 1:-len(arch) - 7]
|
||||||
if ver > sbo_file_version:
|
if ver > sbo_file_version:
|
||||||
prgnam = ("{0}-{1}".format(pkg, ver))
|
prgnam = ("{0}-{1}".format(pkg, ver))
|
||||||
|
|
Loading…
Add table
Reference in a new issue