mirror of
https://gitlab.com/dslackw/slpkg.git
synced 2025-01-29 20:34:22 +01:00
fix arch view in dependencies
This commit is contained in:
parent
cd0d402787
commit
c67cf6e0e6
1 changed files with 66 additions and 52 deletions
|
@ -52,75 +52,89 @@ def sbo_build(name):
|
|||
dependencies_list = sbo_dependencies_pkg(name)
|
||||
try:
|
||||
if dependencies_list is not None:
|
||||
pkg_sum, SC, EC = 0, "", ""
|
||||
requires, dependencies, pkg_for_install = [], [], []
|
||||
pkg_sum = 0
|
||||
arch = os.uname()[4]
|
||||
sbo_ver, pkg_arch = [], []
|
||||
requires, dependencies = [], []
|
||||
PKG_COLOR, DEP_COLOR, ARCH_COLOR, ENDC = "", "", "", colors.ENDC
|
||||
'''
|
||||
Insert master package in list to install it after dependencies
|
||||
'''
|
||||
requires.append(name)
|
||||
'''
|
||||
Create one list for all packages
|
||||
'''
|
||||
for pkg in dependencies_list:
|
||||
requires += pkg
|
||||
requires.reverse()
|
||||
'''
|
||||
Remove double dependencies
|
||||
'''
|
||||
for duplicate in requires:
|
||||
if duplicate not in dependencies:
|
||||
dependencies.append(duplicate)
|
||||
if find_package(name + sp, pkg_path):
|
||||
pkg_for_install.append(colors.GREEN + name + colors.ENDC)
|
||||
pkg_sum = 1
|
||||
else:
|
||||
pkg_for_install.append(colors.RED + name + colors.ENDC)
|
||||
sbo_ver = sbo_version_pkg(name)
|
||||
'''
|
||||
Create two lists one for package version and one
|
||||
for package arch.
|
||||
'''
|
||||
for pkg in dependencies:
|
||||
sbo_ver.append(sbo_version_pkg(pkg))
|
||||
src = sbo_source_dwn(pkg)
|
||||
if arch == "x86_64":
|
||||
pkg_arch.append("x86_64")
|
||||
elif arch.startswith("i") and arch.endswith("86"):
|
||||
pkg_arch.append("i486")
|
||||
elif "arm" in arch:
|
||||
pkg_arch.append("arm")
|
||||
'''
|
||||
Looks if sources unsupported or untested from arch
|
||||
'''
|
||||
if "UNSUPPORTED" in src:
|
||||
pkg_arch.append("UNSUPPORTED")
|
||||
elif "UNTESTED" in src:
|
||||
pkg_arch.append("UNTESTED")
|
||||
if find_package(pkg + sp, pkg_path):
|
||||
pkg_sum += 1
|
||||
sys.stdout.write("Done\n")
|
||||
src = sbo_source_dwn(name)
|
||||
arch = os.uname()[4]
|
||||
if arch == "x86_64":
|
||||
arch = "x86_64"
|
||||
elif arch.startswith("i") and arch.endswith("86"):
|
||||
arch = "i486"
|
||||
elif "arm" in arch:
|
||||
arch = "arm"
|
||||
if "UNSUPPORTED" in src:
|
||||
arch = "UNSUPPORTED"
|
||||
SC, EC = colors.RED, colors.ENDC
|
||||
elif "UNTESTED" in src:
|
||||
arch = "UNTESTED"
|
||||
SC, EC = colors.YELLOW, colors.ENDC
|
||||
'''
|
||||
Tag with color green if package already installed
|
||||
and color red if not installed. Also if package
|
||||
arch is UNSUPPORTED tag with color red and if
|
||||
UNTESTED with color yellow.
|
||||
'''
|
||||
if find_package(name + sp, pkg_path):
|
||||
PKG_COLOR = colors.GREEN
|
||||
else:
|
||||
PKG_COLOR = colors.RED
|
||||
if "UNSUPPORTED" in pkg_arch[-1]:
|
||||
ARCH_COLOR = colors.RED
|
||||
elif "UNTESTED" in pkg_arch[-1]:
|
||||
ARCH_COLOR = colors.YELLOW
|
||||
print("\nThe following packages will be automatically installed or upgraded")
|
||||
print("with new version:\n")
|
||||
template(78)
|
||||
print "| Package", " "*31, "Version", " "*7, "Arch", " "*5, "Repository"
|
||||
template(78)
|
||||
print("Installing:")
|
||||
print " " , "".join(pkg_for_install), \
|
||||
" " * (38-len(name)), sbo_ver, \
|
||||
" " * (14-len(sbo_ver)), SC + arch + EC, \
|
||||
" " * (9-len(arch)), "SBo"
|
||||
print " " , PKG_COLOR + name + ENDC, \
|
||||
" " * (38-len(name)), sbo_ver[-1], \
|
||||
" " * (14-len(sbo_ver[-1])), ARCH_COLOR + pkg_arch[-1] + ENDC, \
|
||||
" " * (9-len(pkg_arch[-1])), "SBo"
|
||||
print("Installing for dependencies:")
|
||||
for dep in dependencies[:-1]:
|
||||
sbo_ver = sbo_version_pkg(dep)
|
||||
src_dep = sbo_source_dwn(dep)
|
||||
dep_arch = os.uname()[4]
|
||||
SC, EC = "", ""
|
||||
if dep_arch == "x86_64":
|
||||
dep_arch = "x86_64"
|
||||
elif arch.startswith("i") and arch.endswith("86"):
|
||||
dep_arch = "i486"
|
||||
elif "arm" in dep_arch:
|
||||
dep_arch = "arm"
|
||||
if "UNSUPPORTED" in src_dep:
|
||||
dep_arch = "UNSUPPORTED"
|
||||
SC, EC = colors.RED, colors.ENDC
|
||||
elif "UNTESTED" in src_dep:
|
||||
dep_arch = "UNTESTED"
|
||||
SC, EC = colors.YELLOW, colors.ENDC
|
||||
ARCH_COLOR = "" # reset arch color for dependencies packages
|
||||
for dep, ver, dep_arch in zip(dependencies[:-1], sbo_ver[:-1], pkg_arch[:-1]):
|
||||
if find_package(dep + sp, pkg_path):
|
||||
print " " , colors.GREEN + dep + colors.ENDC, \
|
||||
" " * (38-len(dep)), sbo_ver, \
|
||||
" " * (14-len(sbo_ver)), SC + dep_arch + EC, \
|
||||
" " * (9-len(dep_arch)), "SBo"
|
||||
pkg_sum += 1
|
||||
DEP_COLOR = colors.GREEN
|
||||
else:
|
||||
print " " , colors.RED + dep + colors.ENDC, \
|
||||
" " * (38-len(dep)), sbo_ver, \
|
||||
" " * (14-len(sbo_ver)), SC + dep_arch + EC, \
|
||||
" " * (9-len(dep_arch)), "SBo"
|
||||
DEP_COLOR = colors.RED
|
||||
if "UNSUPPORTED" in dep_arch:
|
||||
ARCH_COLOR = colors.RED
|
||||
elif "UNTESTED" in dep_arch:
|
||||
ARCH_COLOR = colors.YELLOW
|
||||
print " " , DEP_COLOR + dep + ENDC, \
|
||||
" " * (38-len(dep)), ver, \
|
||||
" " * (14-len(ver)), ARCH_COLOR + dep_arch + ENDC, \
|
||||
" " * (9-len(dep_arch)), "SBo"
|
||||
msg_pkg = "package"
|
||||
msg_2_pkg = msg_pkg
|
||||
if len(dependencies) > 1:
|
||||
|
|
Loading…
Add table
Reference in a new issue