Author: jw Date: 2006-04-04 15:24:50 +0200 (Tue, 04 Apr 2006) New Revision: 1134 Modified: tools/prt-get/trunk/ChangeLog tools/prt-get/trunk/src/prtget.cpp Log: prt-get: update ChangeLog; merge patch Modified: tools/prt-get/trunk/ChangeLog =================================================================== --- tools/prt-get/trunk/ChangeLog 2006-04-04 13:20:58 UTC (rev 1133) +++ tools/prt-get/trunk/ChangeLog 2006-04-04 13:24:50 UTC (rev 1134) @@ -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 Modified: tools/prt-get/trunk/src/prtget.cpp =================================================================== --- tools/prt-get/trunk/src/prtget.cpp 2006-04-04 13:20:58 UTC (rev 1133) +++ tools/prt-get/trunk/src/prtget.cpp 2006-04-04 13:24:50 UTC (rev 1134) @@ -1788,8 +1788,11 @@ list<string> deps; StringHelper::split(package->dependencies(), ',', deps); list<string>::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 @@ cout << " "; } cout << *it; + if (isAlias) { + cout << " (provided by " << aliasName << ")"; + } const Package* p = m_repo->getPackage( *it ); if (p) { if (p->dependencies().length() > 0) {