diff --git a/src/prtget.cpp b/src/prtget.cpp index f40ca8a..01af812 100644 --- a/src/prtget.cpp +++ b/src/prtget.cpp @@ -277,12 +277,13 @@ void PrtGet::listShadowed() string output; Package* p1; Package* p2; - map >::const_iterator it = + + list >::const_iterator it = m_repo->shadowedPackages().begin(); for ( ; it != m_repo->shadowedPackages().end(); ++it ) { output = format; - p1 = it->second.second; - p2 = it->second.first; + p1 = it->second; + p2 = it->first; StringHelper::replaceAll(output, "%n", p1->name()); StringHelper::replaceAll(output, "%p1", p1->path() + "/" + p1->name()); diff --git a/src/repository.cpp b/src/repository.cpp index e4e9eb5..0616096 100644 --- a/src/repository.cpp +++ b/src/repository.cpp @@ -69,7 +69,7 @@ const map& Repository::packages() const \a second is the port which preceeds over \a first \return a map of duplicate packages in the repository */ -const map >& Repository::shadowedPackages() const +const list< pair >& Repository::shadowedPackages() const { return m_shadowedPackages; } @@ -140,6 +140,11 @@ void Repository::searchMatchingPackages( const string& pattern, } } +int compareShadowPair(pair& p1, pair& p2) +{ + return p1.second->name() < p2.second->name(); +} + /*! init repository by reading the directories passed. Doesn't search @@ -226,7 +231,7 @@ void Repository::initFromFS( const list< pair >& rootList, // no such package found, add m_packageMap[name] = p; } else if ( listDuplicate ) { - m_shadowedPackages[name] = make_pair( p, hidden->second ); + m_shadowedPackages.push_back(make_pair( p, hidden->second )); } else { delete p; } @@ -235,7 +240,8 @@ void Repository::initFromFS( const list< pair >& rootList, } closedir( d ); } - + + m_shadowedPackages.sort(compareShadowPair); parseDependencyList(); } diff --git a/src/repository.h b/src/repository.h index 335cc82..df6ca4c 100644 --- a/src/repository.h +++ b/src/repository.h @@ -34,7 +34,7 @@ public: const Package* getPackage( const string& name ) const; const map& packages() const; - const map >& shadowedPackages() const; + const list >& shadowedPackages() const; void searchMatchingPackages( const string& pattern, list& target, @@ -74,7 +74,7 @@ private: void parseDependencyList(); - map > m_shadowedPackages; + list > m_shadowedPackages; map m_packageMap; };