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

Fix resolve dependencies for binary pkgs

Browse source
This commit is contained in:
Dimitris Zlatanidis 2015-06-11 02:55:57 +03:00
parent 8436830e8e
commit c1ae0bb18e
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
slpkg/binary/check.py
View file

@ -63,8 +63,7 @@ def pkg_upgrade(repo, skip):
repo_pkg[3] >= inst_pkg[3] and repo_pkg[3] >= inst_pkg[3] and
inst_pkg[0] not in BlackList().packages() and inst_pkg[0] not in BlackList().packages() and
inst_pkg[0] not in skip): inst_pkg[0] not in skip):
pkgs_for_upgrade.append("{0}-{1}".format(repo_pkg[0], pkgs_for_upgrade.append(repo_pkg[0])
repo_pkg[1]))
Msg().done() Msg().done()
return pkgs_for_upgrade return pkgs_for_upgrade
except KeyboardInterrupt: except KeyboardInterrupt:

6
slpkg/binary/install.py
View file

@ -208,8 +208,6 @@ class BinaryInstall(object):
if self.meta.rsl_deps in ["on", "ON"] and self.resolve: if self.meta.rsl_deps in ["on", "ON"] and self.resolve:
Msg().resolving() Msg().resolving()
for dep in self.packages: for dep in self.packages:
if self.if_upgrade:
dep = dep.split(self.meta.sp)[0]
dependencies = [] dependencies = []
dependencies = Utils().dimensional_list(Dependencies( dependencies = Utils().dimensional_list(Dependencies(
self.PACKAGES_TXT, self.repo).binary(dep, self.resolve)) self.PACKAGES_TXT, self.repo).binary(dep, self.resolve))
@ -269,8 +267,8 @@ class BinaryInstall(object):
for pkg in packages: for pkg in packages:
for name, loc, comp, uncomp in zip(data[0], data[1], data[2], for name, loc, comp, uncomp in zip(data[0], data[1], data[2],
data[3]): data[3]):
if (name and name.startswith(pkg) and name not in install and if (name and name.startswith(pkg + self.meta.sp) and
pkg not in black): name not in install and pkg not in black):
dwn.append("{0}{1}/{2}".format(self.mirror, loc, name)) dwn.append("{0}{1}/{2}".format(self.mirror, loc, name))
install.append(name) install.append(name)
comp_sum.append(comp) comp_sum.append(comp)

3
slpkg/main.py
View file

@ -410,9 +410,10 @@ class ArgParse(object):
def pkg_find(self): def pkg_find(self):
"""Find packages from all enabled repositories """Find packages from all enabled repositories
""" """
packages = self.args[1:]
options = ["-F", "--FIND"] options = ["-F", "--FIND"]
if len(self.args) > 1 and self.args[0] in options: if len(self.args) > 1 and self.args[0] in options:
find_from_repos(self.args[1:]) find_from_repos(packages)
else: else:
usage("") usage("")