From 0f7efb2f5159faddc052d71e13f6a6ee4444de13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Tue, 24 Apr 2007 19:31:31 +0000 Subject: [PATCH] * Remove not used repostr variable, * Return repo name also in info_name@api and use that repo name in pisi info command so MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [caglar@zangetsu][~/svn/uludag/branches/pisi-1.1/pisi]> pisi info emacs-cvs Package found in contrib repository: Ad: emacs-cvs, versiyon 23.0.0, sürüm 12, inşa 1 .... --- pisi/api.py | 4 ++-- pisi/cli/commands.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pisi/api.py b/pisi/api.py index 6c4a20df..0e32ea36 100644 --- a/pisi/api.py +++ b/pisi/api.py @@ -326,9 +326,9 @@ def info_name(package_name, installed=False): """Fetch package information for the given package.""" if installed: package = get_installed_package(package_name) + repo = None else: package, repo = ctx.packagedb.get_package_repo(package_name, pisi.db.itembyrepodb.repos) - repostr = repo from pisi.metadata import MetaData metadata = MetaData() @@ -344,7 +344,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.db.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 cc62a695..e2254d79 100644 --- a/pisi/cli/commands.py +++ b/pisi/cli/commands.py @@ -947,7 +947,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: @@ -955,11 +955,11 @@ Usage: info ... self.print_pkginfo(metadata, files,pisi.db.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.db.itembyrepodb.repos) if not ctx.packagedb.has_package(arg):