Author: jw Date: 2006-04-08 11:41:02 +0200 (Sat, 08 Apr 2006) New Revision: 1179 Modified: tools/prt-get/trunk/ChangeLog tools/prt-get/trunk/src/pkgdb.cpp tools/prt-get/trunk/src/prtget.cpp Log: prt-get: hidden within trailing whitespace removals, a fix for aliases in deptree Modified: tools/prt-get/trunk/ChangeLog =================================================================== --- tools/prt-get/trunk/ChangeLog 2006-04-07 21:13:11 UTC (rev 1178) +++ tools/prt-get/trunk/ChangeLog 2006-04-08 09:41:02 UTC (rev 1179) @@ -11,6 +11,7 @@ - Make 'cat' and 'readme' use $PAGER if set - update default prt-get.conf to reflect new port hierarchy (core/opt/contrib) - add timestamps to log files +- fix aliasing bug introduce earlier in the .12 session (thanks Mark) * 0.5.11 29.05.2005 Johannes Winkelmann - add --path to 'ls' Modified: tools/prt-get/trunk/src/pkgdb.cpp =================================================================== --- tools/prt-get/trunk/src/pkgdb.cpp 2006-04-07 21:13:11 UTC (rev 1178) +++ tools/prt-get/trunk/src/pkgdb.cpp 2006-04-08 09:41:02 UTC (rev 1179) @@ -55,7 +55,7 @@ if ( !load() ) { return false; } - + bool installed = m_packages.find( name ) != m_packages.end(); if (!installed && useAlias) { string provider; @@ -68,6 +68,10 @@ *aliasOrignalName = provider; } } + } else { + if (isAlias) { + *isAlias = false; + } } return installed; @@ -81,13 +85,13 @@ map<string, string>::iterator it = m_aliases.begin(); for (; it != m_aliases.end(); ++it) { StringHelper::split(it->second, ',', - m_splitAliases[it->first]); + m_splitAliases[it->first]); } } - + map<string, vector<string> >::iterator it = m_splitAliases.begin(); for (; it != m_splitAliases.end(); ++it) { - if (find(it->second.begin(), it->second.end(), name) != + if (find(it->second.begin(), it->second.end(), name) != it->second.end()) { providerName = it->first; return true; Modified: tools/prt-get/trunk/src/prtget.cpp =================================================================== --- tools/prt-get/trunk/src/prtget.cpp 2006-04-07 21:13:11 UTC (rev 1178) +++ tools/prt-get/trunk/src/prtget.cpp 2006-04-08 09:41:02 UTC (rev 1179) @@ -1225,12 +1225,12 @@ if (!File::fileExists(file)) { return false; } - + char* pager = getenv("PAGER"); if (pager) { Process proc(pager, file); proc.executeShell(); - } else { + } else { FILE* fp = fopen( file.c_str(), "r" ); char buf[255]; if ( fp ) { @@ -1240,7 +1240,7 @@ fclose( fp ); } } - + return true; }