diff --git a/slpkg/binary/check.py b/slpkg/binary/check.py index 24ced353..f217b8cf 100644 --- a/slpkg/binary/check.py +++ b/slpkg/binary/check.py @@ -63,8 +63,7 @@ def pkg_upgrade(repo, skip): repo_pkg[3] >= inst_pkg[3] and inst_pkg[0] not in BlackList().packages() and inst_pkg[0] not in skip): - pkgs_for_upgrade.append("{0}-{1}".format(repo_pkg[0], - repo_pkg[1])) + pkgs_for_upgrade.append(repo_pkg[0]) Msg().done() return pkgs_for_upgrade except KeyboardInterrupt: diff --git a/slpkg/binary/install.py b/slpkg/binary/install.py index 2fe3ed5b..865e5e3f 100644 --- a/slpkg/binary/install.py +++ b/slpkg/binary/install.py @@ -208,8 +208,6 @@ class BinaryInstall(object): if self.meta.rsl_deps in ["on", "ON"] and self.resolve: Msg().resolving() for dep in self.packages: - if self.if_upgrade: - dep = dep.split(self.meta.sp)[0] dependencies = [] dependencies = Utils().dimensional_list(Dependencies( self.PACKAGES_TXT, self.repo).binary(dep, self.resolve)) @@ -269,8 +267,8 @@ class BinaryInstall(object): for pkg in packages: for name, loc, comp, uncomp in zip(data[0], data[1], data[2], data[3]): - if (name and name.startswith(pkg) and name not in install and - pkg not in black): + if (name and name.startswith(pkg + self.meta.sp) and + name not in install and pkg not in black): dwn.append("{0}{1}/{2}".format(self.mirror, loc, name)) install.append(name) comp_sum.append(comp) diff --git a/slpkg/main.py b/slpkg/main.py index b88ceec1..74dd47b6 100644 --- a/slpkg/main.py +++ b/slpkg/main.py @@ -410,9 +410,10 @@ class ArgParse(object): def pkg_find(self): """Find packages from all enabled repositories """ + packages = self.args[1:] options = ["-F", "--FIND"] if len(self.args) > 1 and self.args[0] in options: - find_from_repos(self.args[1:]) + find_from_repos(packages) else: usage("")