Miroirs/slpkg
1
0
Fork 0
mirror of https://gitlab.com/dslackw/slpkg.git synced 2025-01-30 20:34:38 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix: Strange dependency problem (2) #97

Browse source 
Signed-off-by: Dimitris Zlatanidis <d.zlatanidis@gmail.com>
This commit is contained in:
Dimitris Zlatanidis 2017-10-14 20:29:07 +02:00
parent 3ba61b8fbf
commit 3303aecf6d
3 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
slpkg/binary/install.py
View file

@ -104,10 +104,11 @@ class BinaryInstall(object):
"--resolve-off" not in self.flag):
self.msg.done()
if self.install:
print("\nThe following packages will be automatically "
"installed or upgraded \nwith new version:\n")
if self.matching:
self.msg.matching(self.packages)
else:
print("\nThe following packages will be automatically "
"installed or upgraded \nwith new version:\n")
self.top_view()
self.msg.upg_inst(self.is_upgrade)
mas_sum = self.views(self.install, self.comp_sum)
@ -120,6 +121,11 @@ class BinaryInstall(object):
sums = [sum(i) for i in zip(mas_sum, dep_sum)]
unit, size = units(self.comp_sum + self.dep_comp_sum,
self.uncomp_sum + self.dep_uncomp_sum)
if self.matching:
print("\nMatching summary")
print("=" * 79)
print("Total {0} matching packages\n".format(sum(sums)))
raise SystemExit(1)
print("\nInstalling summary")
print("=" * 79)
print("{0}Total {1} {2}.".format(self.meta.color["GREY"],

2
slpkg/messages.py
View file

@ -165,7 +165,7 @@ class Msg(object):
def matching(self, packages):
"""Message for matching packages
"""
print("Not found package with the name [ {0}{1}{2} ]. "
print("\nNot found package with the name [ {0}{1}{2} ]. "
"Matching packages:\nNOTE: Not dependenc"
"ies are resolved\n".format(self.meta.color["CYAN"],
"".join(packages),

11
slpkg/sbo/slackbuild.py
View file

@ -117,10 +117,11 @@ class SBoInstall(object):
self.clear_masters()
if self.package_found:
print("\nThe following packages will be automatically "
"installed or upgraded \nwith new version:\n")
if self.match:
self.msg.matching(self.slackbuilds)
else:
print("\nThe following packages will be automatically "
"installed or upgraded \nwith new version:\n")
self.top_view()
self.msg.upg_inst(self.is_upgrade)
@ -141,8 +142,12 @@ class SBoInstall(object):
count_total = sum([self.count_ins, self.count_upg,
self.count_uni])
if self.match:
print("\nMatching summary")
print("=" * 79)
print("Total {0} matching packages\n".format(count_total))
raise SystemExit(1)
print("\nInstalling summary")
print("=" * 79)
print("{0}Total {1} {2}.".format(
self.meta.color["GREY"], count_total,
self.msg.pkg(count_total)))