From 532e954739caa9004498a616909898c0f84d4355 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Mon, 30 Oct 2006 21:59:20 +0000 Subject: [PATCH] =?UTF-8?q?*=20get=5Funion=5Fcomp=20demek=20sadece=20o=20c?= =?UTF-8?q?omp=20demek,=20recursive=20comp=20demek=20de=C4=9Fil.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * get_packages recursive islevi icin multirepo fixi. --- pisi/cli/commands.py | 2 +- pisi/component.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pisi/cli/commands.py b/pisi/cli/commands.py index 09b9aa04..cb5527c8 100644 --- a/pisi/cli/commands.py +++ b/pisi/cli/commands.py @@ -1267,7 +1267,7 @@ all repositories. component = ctx.get_option('component') if component: - list = ctx.componentdb.get_packages(component, repo=repo) + list = ctx.componentdb.get_packages(component, walk=True, repo=repo) else: list = ctx.packagedb.list_packages(repo) installed_list = ctx.installdb.list_installed() diff --git a/pisi/component.py b/pisi/component.py index ba49b768..d7224206 100644 --- a/pisi/component.py +++ b/pisi/component.py @@ -110,7 +110,7 @@ class ComponentDB(object): srcs = set() for repostr in self.d.order(repo = repo): if s.has_key(repostr): - pkgs |= set(self.get_packages(name, True, repo, txn)) + pkgs |= set(s[repostr].packages) srcs |= set(s[repostr].sources) comp = self.get_component(name) comp.packages = list(pkgs) @@ -125,7 +125,7 @@ class ComponentDB(object): # walk: walks through the underlying components' packages def get_packages(self, component_name, walk=False, repo=None, txn = None): """returns the given component's and underlying recursive components' packages""" - + component = self.get_component(component_name, repo, txn) if not walk: return component.packages @@ -133,7 +133,7 @@ class ComponentDB(object): packages = [] packages.extend(component.packages) for dep in component.dependencies: - packages.extend(self.get_packages(dep)) + packages.extend(self.get_packages(dep, walk, repo, txn)) return packages