Pisilinux3/pisi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Remove not used repostr variable,

Browse Source 
* 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:
S.Çağlar Onur
2007-04-24 19:31:31 +00:00
parent be154562f1
commit 0f7efb2f51
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/api.py
+2 -2
View File
@@ -326,9 +326,9 @@ def info_name(package_name, installed=False):
"""Fetch package information for the given package.""" """Fetch package information for the given package."""
if installed: if installed:
package = get_installed_package(package_name) package = get_installed_package(package_name)
repo = None
else: else:
package, repo = ctx.packagedb.get_package_repo(package_name, pisi.db.itembyrepodb.repos) package, repo = ctx.packagedb.get_package_repo(package_name, pisi.db.itembyrepodb.repos)
repostr = repo
from pisi.metadata import MetaData from pisi.metadata import MetaData
metadata = MetaData() metadata = MetaData()
@@ -344,7 +344,7 @@ def info_name(package_name, installed=False):
files = None files = None
else: else:
files = None files = None
return metadata, files return metadata, files, repo
def search_package_terms(terms, repo = pisi.db.itembyrepodb.all): def search_package_terms(terms, repo = pisi.db.itembyrepodb.all):
return search_in_packages(terms, ctx.packagedb.list_packages(repo), repo) return search_in_packages(terms, ctx.packagedb.list_packages(repo), repo)
pisi/cli/commands.py
+3 -3
View File
@@ -947,7 +947,7 @@ Usage: info <package1> <package2> ... <packagen>
self.print_pkginfo(metadata, files) self.print_pkginfo(metadata, files)
else: else:
if ctx.installdb.is_installed(arg): 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: if self.options.short:
ctx.ui.info(_('[inst] '), noln=True) ctx.ui.info(_('[inst] '), noln=True)
else: else:
@@ -955,11 +955,11 @@ Usage: info <package1> <package2> ... <packagen>
self.print_pkginfo(metadata, files,pisi.db.itembyrepodb.installed) self.print_pkginfo(metadata, files,pisi.db.itembyrepodb.installed)
if ctx.packagedb.has_package(arg): 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: if self.options.short:
ctx.ui.info(_('[repo] '), noln=True) ctx.ui.info(_('[repo] '), noln=True)
else: 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) self.print_pkginfo(metadata, files, pisi.db.itembyrepodb.repos)
if not ctx.packagedb.has_package(arg): if not ctx.packagedb.has_package(arg):