use list instead of set, we cannot assume tag files cannot have duplicates, capabilit...

diff --git a/zypp/parser/tagfile/TagFileParser.cc b/zypp/parser/tagfile/TagFileParser.cc
index ef4d1d70a6900035bcd0a3aad121674e46277dea..4eb6729a37121ad9f21db8efbfccd02e384cceac 100644 (file)
--- a/zypp/parser/tagfile/TagFileParser.cc
+++ b/zypp/parser/tagfile/TagFileParser.cc
@@ -106,7 +106,7 @@ namespace zypp
             // while we dont find the list terminator
             while( ! boost::regex_match(element, element_what, boost::regex("^\\-([^[:space:]^\\.]+)(\\.([^[:space:]]+))?:$"), boost::match_extra))
             {
-              tag.values.insert(element);
+              tag.values.push_back(element);
               XXX << element << std::endl;
               getline(file, element);
               //dumpRegexpResults(element_what);

diff --git a/zypp/parser/tagfile/TagFileParser.h b/zypp/parser/tagfile/TagFileParser.h
index 45b3e05ac93387d4d9d79b3bb814543b77edf1ca..4412cfe71a904fdffd02547f6a37e095a8f9c95e 100644 (file)
--- a/zypp/parser/tagfile/TagFileParser.h
+++ b/zypp/parser/tagfile/TagFileParser.h
@@ -13,7 +13,6 @@
 #define ZYPP_PARSER_TAGFILE2_H
 
 #include <iosfwd>
-#include <set>
 #include <map>
 #include <list>
 
@@ -42,7 +41,7 @@ namespace zypp
         {
           std::string name;
           std::string modifier;
-          std::set<std::string> values;
+          std::list<std::string> values;
         };
 
         struct SingleTag

diff --git a/zypp/source/susetags/PackagesParser.cc b/zypp/source/susetags/PackagesParser.cc
index 7167891c83696bc71c9987202c3ae17224f8cb59..d7b98fa27cd3d047ca90757b6c53709fa2e9e3a5 100644 (file)
--- a/zypp/source/susetags/PackagesParser.cc
+++ b/zypp/source/susetags/PackagesParser.cc
@@ -62,9 +62,9 @@ namespace zypp
           collectPkg( shared_ptr<source::susetags::SuseTagsPackageImpl>(new source::susetags::SuseTagsPackageImpl(_source)) );
         }
 
-        void collectDeps( const std::set<std::string> & depstr_r, CapSet & capset )
+        void collectDeps( const std::list<std::string> & depstr_r, CapSet & capset )
         {
-          for ( std::set<std::string>::const_iterator it = depstr_r.begin();
+          for ( std::list<std::string>::const_iterator it = depstr_r.begin();
                 it != depstr_r.end(); ++it )
             {
               capset.insert( CapFactory().parse( ResTraits<Package>::kind, *it ) );
@@ -152,12 +152,12 @@ namespace zypp
             }
           else if ( mtag_r.name == "Key" )
             {
-               pkgImpl->_keywords = std::list<std::string>(mtag_r.values.begin(), mtag_r.values.end());
+               pkgImpl->_keywords = mtag_r.values;
             }
           else if ( mtag_r.name == "Aut" )
             {
               // MultiTag is a Set but author is a list
-              pkgImpl->_authors = std::list<std::string>(mtag_r.values.begin(), mtag_r.values.end());
+              pkgImpl->_authors = mtag_r.values;
             }
         }
 

diff --git a/zypp/source/susetags/SelectionSelFileParser.cc b/zypp/source/susetags/SelectionSelFileParser.cc
index dafbae16ef74b7ca7bd550c729c68dd119614c43..64355cb2fc40f8b117da637785ff59c779969127 100644 (file)
--- a/zypp/source/susetags/SelectionSelFileParser.cc
+++ b/zypp/source/susetags/SelectionSelFileParser.cc
@@ -113,25 +113,25 @@ namespace zypp
         CapFactory _f;
        Dependencies _deps;
 
-        for (std::set<std::string>::const_iterator it = selImpl->_inspacks[LanguageCode()].begin(); it != selImpl->_inspacks[LanguageCode()].end(); it++)
+        for (std::list<std::string>::const_iterator it = selImpl->_inspacks[LanguageCode()].begin(); it != selImpl->_inspacks[LanguageCode()].end(); it++)
         {
           Capability _cap = _f.parse( ResTraits<Package>::kind, *it);
          _deps[Dep::REQUIRES].insert(_cap);
         }
         
-        for (std::set<std::string>::const_iterator it = selImpl->_recommends.begin(); it != selImpl->_recommends.end(); it++)
+        for (std::list<std::string>::const_iterator it = selImpl->_recommends.begin(); it != selImpl->_recommends.end(); it++)
         {
           Capability _cap = _f.parse( ResTraits<Selection>::kind, *it );
          _deps[Dep::RECOMMENDS].insert(_cap);
         }
 
-        for (std::set<std::string>::const_iterator it = selImpl->_requires.begin(); it != selImpl->_requires.end(); it++)
+        for (std::list<std::string>::const_iterator it = selImpl->_requires.begin(); it != selImpl->_requires.end(); it++)
         {
           Capability _cap = _f.parse( ResTraits<Selection>::kind, *it );
          _deps[Dep::REQUIRES].insert(_cap);
         }
 
-        for (std::set<std::string>::const_iterator it = selImpl->_conflicts.begin(); it != selImpl->_conflicts.end(); it++)
+        for (std::list<std::string>::const_iterator it = selImpl->_conflicts.begin(); it != selImpl->_conflicts.end(); it++)
         {
           Capability _cap = _f.parse( ResTraits<Selection>::kind, *it );
          _deps[Dep::CONFLICTS].insert(_cap);

diff --git a/zypp/source/susetags/SuseTagsSelectionImpl.h b/zypp/source/susetags/SuseTagsSelectionImpl.h
index ea2270958b32476120d190ac51da9558eed25040..41f6b514208be674cbc3c14e7c04c6144079839a 100644 (file)
--- a/zypp/source/susetags/SuseTagsSelectionImpl.h
+++ b/zypp/source/susetags/SuseTagsSelectionImpl.h
@@ -73,15 +73,15 @@ namespace zypp
       std::string _category;
       bool _visible;
 
-      std::set<std::string> _suggests;
-      std::set<std::string> _recommends;
-      std::set<std::string> _requires;
-      std::set<std::string> _conflicts;
-      std::set<std::string> _supported_locales;
-      std::map< LanguageCode, std::set<std::string> > _insnotify;
-      std::map< LanguageCode, std::set<std::string> > _delnotify;
-      std::map< LanguageCode, std::set<std::string> > _inspacks;
-      std::map< LanguageCode, std::set<std::string> > _delpacks;
+      std::list<std::string> _suggests;
+      std::list<std::string> _recommends;
+      std::list<std::string> _requires;
+      std::list<std::string> _conflicts;
+      std::list<std::string> _supported_locales;
+      std::map< LanguageCode, std::list<std::string> > _insnotify;
+      std::map< LanguageCode, std::list<std::string> > _delnotify;
+      std::map< LanguageCode, std::list<std::string> > _inspacks;
+      std::map< LanguageCode, std::list<std::string> > _delpacks;
       
     };
     ///////////////////////////////////////////////////////////////////