From 62ab83eb8739d77b71df9cb66e427cdb163d6d0f Mon Sep 17 00:00:00 2001 From: Johannes Winkelmann Date: Tue, 4 Apr 2006 13:24:50 +0000 Subject: [PATCH] prt-get: update ChangeLog; merge patch git-svn-id: https://crux.nu/svn/tools/prt-get/trunk@1134 0b5ae1c7-2405-0410-a7fc-ba219f786e1e --- ChangeLog | 5 +++++ src/prtget.cpp | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ba99203..f66336d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +* 0.5.12 00.04.2006 Johannes Winkelmann +- Fix compilation on OpenBSD +- Show alias info in depends +- don't install alias file and deplist + * 0.5.11 29.05.2005 Johannes Winkelmann - add --path to 'ls' - initial regex support diff --git a/src/prtget.cpp b/src/prtget.cpp index 9310cc4..943d3f9 100644 --- a/src/prtget.cpp +++ b/src/prtget.cpp @@ -1788,8 +1788,11 @@ void PrtGet::printDepsLevel(int indent, const Package* package) list deps; StringHelper::split(package->dependencies(), ',', deps); list::iterator it = deps.begin(); + bool isAlias = false; + string aliasName = ""; + for (; it != deps.end(); ++it) { - if ( m_pkgDB->isInstalled( *it ) ) { + if ( m_pkgDB->isInstalled( *it, true, &isAlias, &aliasName ) ) { cout << "[i] "; } else { cout << "[ ] "; @@ -1798,6 +1801,9 @@ void PrtGet::printDepsLevel(int indent, const Package* package) cout << " "; } cout << *it; + if (isAlias) { + cout << " (provided by " << aliasName << ")"; + } const Package* p = m_repo->getPackage( *it ); if (p) { if (p->dependencies().length() > 0) {