* Remove not used repostr variable,
* Return repo name also in info_name@api and use that repo name in pisi info command so [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 ....
This commit is contained in:
+2
-2
@@ -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)
|
||||
|
||||
@@ -947,7 +947,7 @@ Usage: info <package1> <package2> ... <packagen>
|
||||
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 <package1> <package2> ... <packagen>
|
||||
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):
|
||||
|
||||
Reference in New Issue
Block a user