Miroirs/slpkg
1
0
Fork 0
mirror of https://gitlab.com/dslackw/slpkg.git synced 2024-11-17 07:48:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update variable name

Browse source
This commit is contained in:
Dimitris Zlatanidis 2015-12-18 07:49:02 +02:00
parent 81ba2e2d41
commit dda966f6aa
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
slpkg/binary/install.py
View file

@ -75,13 +75,13 @@ class BinaryInstall(object):
self.data = repo_data(self.PACKAGES_TXT, self.repo, self.flag)
self.blacklist = BlackList().packages(self.data[0], self.repo)
def start(self, if_upgrade):
def start(self, is_upgrade):
"""
Install packages from official Slackware distribution
"""
self.case_insensitive()
# fix if packages is for upgrade
self.if_upgrade = if_upgrade
self.is_upgrade = is_upgrade
mas_sum = dep_sum = sums = [0, 0, 0]
self.msg.done()
self.dependencies = self.resolving_deps()
@ -98,7 +98,7 @@ class BinaryInstall(object):
print("\nThe following packages will be automatically "
"installed or upgraded \nwith new version:\n")
self.top_view()
self.msg.upg_inst(self.if_upgrade)
self.msg.upg_inst(self.is_upgrade)
mas_sum = self.views(self.install, self.comp_sum)
if self.dependencies:
print("Installing for dependencies:")
@ -139,7 +139,7 @@ class BinaryInstall(object):
write_deps(self.deps_dict)
delete_package(self.tmp_path, self.install)
else:
self.msg.not_found(self.if_upgrade)
self.msg.not_found(self.is_upgrade)
def case_insensitive(self):
"""Matching packages distinguish between uppercase and

10
slpkg/main.py
View file

@ -280,15 +280,15 @@ class ArgParse(object):
self.args[1] in self.meta.repositories):
if self.args[1] not in ["slack", "sbo"]:
BinaryInstall(pkg_upgrade(self.args[1], skip, flag),
self.args[1], flag).start(if_upgrade=True)
self.args[1], flag).start(is_upgrade=True)
elif self.args[1] == "slack":
if self.meta.only_installed in ["on", "ON"]:
BinaryInstall(pkg_upgrade("slack", skip, flag),
"slack", flag).start(if_upgrade=True)
"slack", flag).start(is_upgrade=True)
else:
Patches(skip, flag).start()
elif self.args[1] == "sbo":
SBoInstall(sbo_upgrade(skip, flag), flag).start(if_upgrade=True)
SBoInstall(sbo_upgrade(skip, flag), flag).start(is_upgrade=True)
else:
usage(self.args[1])
elif len(self.args) == 2 and self.args[0] in options:
@ -340,10 +340,10 @@ class ArgParse(object):
if (self.args[1] in self.meta.repositories and
self.args[1] not in ["sbo"]):
BinaryInstall(self.args[2:], self.args[1], flag).start(
if_upgrade=False)
is_upgrade=False)
elif (self.args[1] == "sbo" and
self.args[1] in self.meta.repositories):
SBoInstall(self.args[2:], flag).start(if_upgrade=False)
SBoInstall(self.args[2:], flag).start(is_upgrade=False)
else:
usage(self.args[1])
else:

8
slpkg/sbo/slackbuild.py
View file

@ -77,11 +77,11 @@ class SBoInstall(object):
self.data = SBoGrep(name="").names()
self.blacklist = BlackList().packages(pkgs=self.data, repo="sbo")
def start(self, if_upgrade):
def start(self, is_upgrade):
"""Start view, build and install SBo packages
"""
tagc = ""
self.if_upgrade = if_upgrade
self.is_upgrade = is_upgrade
self.case_insensitive()
for _sbo in self.slackbuilds:
status(0.03)
@ -115,7 +115,7 @@ class SBoInstall(object):
print("\nThe following packages will be automatically "
"installed or upgraded \nwith new version:\n")
self.top_view()
self.msg.upg_inst(self.if_upgrade)
self.msg.upg_inst(self.is_upgrade)
# view master packages
for sbo, arch in zip(self.master_packages, mas_src):
@ -147,7 +147,7 @@ class SBoInstall(object):
print("will be upgraded.{0}\n".format(self.meta.color["ENDC"]))
self.continue_to_install()
else:
self.msg.not_found(self.if_upgrade)
self.msg.not_found(self.is_upgrade)
def case_insensitive(self):
"""Matching packages distinguish between uppercase and