From bbb56f12b52ab309c86a5ba4a6b3c2ba006449ac Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Fri, 27 Apr 2007 13:45:32 +0000 Subject: [PATCH] [MERGE] info_name should return repo_name for pisi info command --- pisi/api.py | 3 ++- pisi/cli/commands.py | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pisi/api.py b/pisi/api.py index f02834d2..cb9506d9 100644 --- a/pisi/api.py +++ b/pisi/api.py @@ -315,6 +315,7 @@ def info_name(package_name, installed=False): """Fetch package information for the given package.""" if installed: package = ctx.packagedb.get_package(package_name, pisi.itembyrepodb.installed) + repo = None else: package, repo = ctx.packagedb.get_package_repo(package_name, pisi.itembyrepodb.repos) @@ -331,7 +332,7 @@ def info_name(package_name, installed=False): files = None else: files = None - return metadata, files + return metadata, files, repo def search_package_terms(terms, repo = pisi.itembyrepodb.all): return search_in_packages(terms, ctx.packagedb.list_packages(repo), repo) diff --git a/pisi/cli/commands.py b/pisi/cli/commands.py index a144506b..68a0babd 100644 --- a/pisi/cli/commands.py +++ b/pisi/cli/commands.py @@ -944,7 +944,7 @@ Usage: info ... self.print_pkginfo(metadata, files) else: if ctx.installdb.is_installed(arg): - metadata, files = pisi.api.info_name(arg, True) + metadata, files, repo = pisi.api.info_name(arg, True) if self.options.short: ctx.ui.info(_('[inst] '), noln=True) else: @@ -952,11 +952,11 @@ Usage: info ... self.print_pkginfo(metadata, files,pisi.itembyrepodb.installed) if ctx.packagedb.has_package(arg): - metadata, files = pisi.api.info_name(arg, False) + metadata, files, repo = pisi.api.info_name(arg, False) if self.options.short: ctx.ui.info(_('[repo] '), noln=True) else: - ctx.ui.info(_('Package found in repository:')) + ctx.ui.info(_('Package found in %s repository:') % repo) self.print_pkginfo(metadata, files, pisi.itembyrepodb.repos) if not ctx.packagedb.has_package(arg):