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

[MERGE] info_name should return repo_name for pisi info command

Browse Source
This commit is contained in:
Faik Uygur
2007-04-27 13:45:32 +00:00
parent b3c4ddc92f
commit bbb56f12b5
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/api.py
+2 -1
View File
@@ -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)
pisi/cli/commands.py
+3 -3
View File
@@ -944,7 +944,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:
@@ -952,11 +952,11 @@ Usage: info <package1> <package2> ... <packagen>
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):