Miroirs/slpkg
1
0
Fork 0
mirror of https://gitlab.com/dslackw/slpkg.git synced 2025-02-07 08:46:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix view version if upgrade

Browse source
This commit is contained in:
Dimitris Zlatanidis 2015-01-24 00:38:12 +02:00
parent 6ea876bcf7
commit 6a18ab367d
3 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
slpkg/binary/check.py
View file

@ -46,6 +46,7 @@ def pkg_upgrade(repo):
sys.stdout.write("{0}Checking ...{1}".format(color['GREY'], color['ENDC'])) sys.stdout.write("{0}Checking ...{1}".format(color['GREY'], color['ENDC']))
PACKAGES_TXT = RepoInit(repo).fetch()[0] PACKAGES_TXT = RepoInit(repo).fetch()[0]
pkgs_for_upgrade = [] pkgs_for_upgrade = []
ver_for_upgrade = []
# name = data[0] # name = data[0]
# location = data[1] # location = data[1]
# size = data[2] # size = data[2]
@ -62,8 +63,9 @@ def pkg_upgrade(repo):
if (repo_pkg[0] == inst_pkg[0] and repo_pkg[1] > inst_pkg[1] and if (repo_pkg[0] == inst_pkg[0] and repo_pkg[1] > inst_pkg[1] and
inst_pkg[0] not in BlackList().packages()): inst_pkg[0] not in BlackList().packages()):
pkgs_for_upgrade.append(repo_pkg[0]) pkgs_for_upgrade.append(repo_pkg[0])
ver_for_upgrade.append('-' + inst_pkg[1])
sys.stdout.write("{0}Done{1}\n".format(color['GREY'], color['ENDC'])) sys.stdout.write("{0}Done{1}\n".format(color['GREY'], color['ENDC']))
return pkgs_for_upgrade return pkgs_for_upgrade, ver_for_upgrade
def installed(): def installed():

17
slpkg/binary/install.py
View file

@ -76,11 +76,15 @@ class BinaryInstall(object):
num_lines = sum(1 for line in self.PACKAGES_TXT) num_lines = sum(1 for line in self.PACKAGES_TXT)
self.step = (num_lines / 700) self.step = (num_lines / 700)
def start(self): def start(self, if_upgrade):
''' '''
Install packages from official Slackware distribution Install packages from official Slackware distribution
''' '''
try: try:
# fix if packages is for upgrade
self.if_upgrade, self.pkg_ver = if_upgrade, []
if self.if_upgrade:
self.packages, self.pkg_ver = self.packages[0], self.packages[1]
mas_sum = dep_sum = sums = [0, 0, 0] mas_sum = dep_sum = sums = [0, 0, 0]
self.pkg_exist() self.pkg_exist()
sys.stdout.write("{0}Done{1}\n".format(color['GREY'], sys.stdout.write("{0}Done{1}\n".format(color['GREY'],
@ -233,9 +237,14 @@ class BinaryInstall(object):
Views packages Views packages
''' '''
pkg_sum = uni_sum = upg_sum = 0 pkg_sum = uni_sum = upg_sum = 0
# create empty seats if not upgrade
if not self.if_upgrade:
i = 0
for i in range(len(install)):
self.pkg_ver.append('')
# fix repositories align # fix repositories align
repo = self.repo + (' ' * (6 - (len(self.repo)))) repo = self.repo + (' ' * (6 - (len(self.repo))))
for pkg, comp in zip(install, comp_sum): for pkg, ver, comp in zip(install, self.pkg_ver, comp_sum):
pkg_split = split_package(pkg[:-4]) pkg_split = split_package(pkg[:-4])
if find_package(pkg_split[0] + "-" + pkg_split[1], pkg_path): if find_package(pkg_split[0] + "-" + pkg_split[1], pkg_path):
pkg_sum += 1 pkg_sum += 1
@ -247,8 +256,8 @@ class BinaryInstall(object):
COLOR = color['RED'] COLOR = color['RED']
uni_sum += 1 uni_sum += 1
print(" {0}{1}{2}{3} {4}{5} {6}{7}{8}{9}{10}{11:>11}{12}".format( print(" {0}{1}{2}{3} {4}{5} {6}{7}{8}{9}{10}{11:>11}{12}".format(
COLOR, pkg_split[0], color['ENDC'], COLOR, pkg_split[0] + ver, color['ENDC'],
" " * (24-len(pkg_split[0])), pkg_split[1], " " * (24-len(pkg_split[0] + ver)), pkg_split[1],
" " * (18-len(pkg_split[1])), pkg_split[2], " " * (18-len(pkg_split[1])), pkg_split[2],
" " * (8-len(pkg_split[2])), pkg_split[3], " " * (8-len(pkg_split[2])), pkg_split[3],
" " * (7-len(pkg_split[3])), repo, " " * (7-len(pkg_split[3])), repo,

4
slpkg/main.py
View file

@ -69,7 +69,7 @@ class Case(object):
SBoInstall(self.package).start() SBoInstall(self.package).start()
def binary_install(self, repo): def binary_install(self, repo):
BinaryInstall(self.package, repo, self.release).start() BinaryInstall(self.package, repo, self.release).start(False)
def sbo_upgrade(self): def sbo_upgrade(self):
SBoInstall(sbo_upgrade()).start() SBoInstall(sbo_upgrade()).start()
@ -78,7 +78,7 @@ class Case(object):
Patches(self.release).start() Patches(self.release).start()
def binary_upgrade(self, repo): def binary_upgrade(self, repo):
BinaryInstall(pkg_upgrade(repo), repo, self.release).start() BinaryInstall(pkg_upgrade(repo), repo, self.release).start(True)
def main(): def main():