add provides and obsoletes for selections and patterns

diff --git a/zypp/source/susetags/PatternTagFileParser.cc b/zypp/source/susetags/PatternTagFileParser.cc
index 7d5208a..4483749 100644 (file)
--- a/zypp/source/susetags/PatternTagFileParser.cc
+++ b/zypp/source/susetags/PatternTagFileParser.cc
@@ -98,6 +98,14 @@ namespace zypp
         {
           selImpl->_recommends = tag.values;
         }
+        else if ( tag.name == "Prv" )
+        {
+          selImpl->_provides = tag.values;
+        }
+        else if ( tag.name == "Obs" )
+        {
+          selImpl->_obsoletes = tag.values;
+        }
         else if ( tag.name == "Con" )
         {
           selImpl->_conflicts = tag.values;
@@ -136,9 +144,20 @@ namespace zypp
          _deps[Dep::CONFLICTS].insert(_cap);
         }
 
+        for (std::list<std::string>::const_iterator it = selImpl->_provides.begin(); it != selImpl->_provides.end(); it++)
+        {
+          Capability _cap = _f.parse( ResTraits<Pattern>::kind, *it );
+         _deps[Dep::PROVIDES].insert(_cap);
+        }
+
+        for (std::list<std::string>::const_iterator it = selImpl->_obsoletes.begin(); it != selImpl->_obsoletes.end(); it++)
+        {
+          Capability _cap = _f.parse( ResTraits<Pattern>::kind, *it );
+         _deps[Dep::OBSOLETES].insert(_cap);
+        }
+
         for (std::list<std::string>::const_iterator it = selImpl->_pkgrecommends.begin(); it != selImpl->_pkgrecommends.end(); it++)
         {
-DBG << "recommends pkg '" << *it << "'" << endl;
           Capability _cap = _f.parse( ResTraits<Package>::kind, *it );
          _deps[Dep::RECOMMENDS].insert(_cap);
         }

diff --git a/zypp/source/susetags/SelectionTagFileParser.cc b/zypp/source/susetags/SelectionTagFileParser.cc
index 10a276f..2505300 100644 (file)
--- a/zypp/source/susetags/SelectionTagFileParser.cc
+++ b/zypp/source/susetags/SelectionTagFileParser.cc
@@ -42,103 +42,124 @@ namespace zypp
 
       Selection::Ptr parseSelection( const Pathname & file_r )
       {
-        SelectionTagFileParser p;
-        p.parse( file_r );
-        return p.result;
+       SelectionTagFileParser p;
+       p.parse( file_r );
+       return p.result;
 
       }
 
       SelectionTagFileParser::SelectionTagFileParser()
       {
-        selImpl = shared_ptr<SuseTagsSelectionImpl>(new SuseTagsSelectionImpl);
+       selImpl = shared_ptr<SuseTagsSelectionImpl>(new SuseTagsSelectionImpl);
       }
 
       void SelectionTagFileParser::consume( const SingleTag &tag )
       {
-        if ( tag.name == "Sum" )
-        {
-          selImpl->_summary.setText(tag.value, LanguageCode(tag.modifier));
-        }
-        else if ( tag.name == "Ver" )
-        {
-          selImpl->_parser_version = tag.value;
-        }
-        else if ( tag.name == "Sel" )
-        {
-          std::string line = tag.value;
-          std::vector<std::string> words;
-          str::split( line, std::back_inserter(words), " " );
-          XXX << "[" << words[0] << "]" << "[" << words[1] << "]" << "[" << words[2] << "]" << "[" << words[3] << "]" << std::endl;
-          selImpl->_name = words[0];
-          selImpl->_version = words[1];
-          selImpl->_release = words[2];
-          selImpl->_arch = words[3];
-        }
-        else if ( tag.name == "Vis" )
-        {
-          selImpl->_visible = (tag.value == "true") ? true : false;
-        }
-        else if ( tag.name == "Cat" )
-        {
-          selImpl->_category = tag.value;
-        }
-         else if ( tag.name == "Ord" )
-        {
-          selImpl->_order = tag.value;
-        }
+       if ( tag.name == "Sum" )
+       {
+         selImpl->_summary.setText(tag.value, LanguageCode(tag.modifier));
+       }
+       else if ( tag.name == "Ver" )
+       {
+         selImpl->_parser_version = tag.value;
+       }
+       else if ( tag.name == "Sel" )
+       {
+         std::string line = tag.value;
+         std::vector<std::string> words;
+         str::split( line, std::back_inserter(words), " " );
+         XXX << "[" << words[0] << "]" << "[" << words[1] << "]" << "[" << words[2] << "]" << "[" << words[3] << "]" << std::endl;
+         selImpl->_name = words[0];
+         selImpl->_version = words[1];
+         selImpl->_release = words[2];
+         selImpl->_arch = words[3];
+       }
+       else if ( tag.name == "Vis" )
+       {
+         selImpl->_visible = (tag.value == "true") ? true : false;
+       }
+       else if ( tag.name == "Cat" )
+       {
+         selImpl->_category = tag.value;
+       }
+        else if ( tag.name == "Ord" )
+       {
+         selImpl->_order = tag.value;
+       }
       }
       
       void SelectionTagFileParser::consume( const MultiTag &tag )
       {
-        if ( tag.name == "Req" )
-        {
-          selImpl->_requires = tag.values;
-        }
-        if ( tag.name == "Rec" )
-        {
-          selImpl->_recommends = tag.values;
-        }
-        else if ( tag.name == "Con" )
-        {
-          selImpl->_conflicts = tag.values;
-        }
-        else if ( tag.name == "Ins" )
-        {
-          selImpl->_inspacks[LanguageCode(tag.modifier)] = tag.values;
-        }
+       if ( tag.name == "Req" )
+       {
+         selImpl->_requires = tag.values;
+       }
+       else if ( tag.name == "Rec" )
+       {
+         selImpl->_recommends = tag.values;
+       }
+       else if ( tag.name == "Prv" )
+       {
+         selImpl->_provides = tag.values;
+       }
+       else if ( tag.name == "Con" )
+       {
+         selImpl->_conflicts = tag.values;
+       }
+       else if ( tag.name == "Obs" )
+       {
+         selImpl->_obsoletes = tag.values;
+       }
+       else if ( tag.name == "Ins" )
+       {
+         selImpl->_inspacks[LanguageCode(tag.modifier)] = tag.values;
+       }
       }
 
       void SelectionTagFileParser::endParse()
       {
-        #warning FIXME how to insert the specific language packages
-        CapFactory _f;
+       #warning FIXME how to insert the specific language packages
+       CapFactory _f;
        Dependencies _deps;
 
-        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);
+       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::RECOMMENDS].insert(_cap);
-        }
-        
-        for (std::list<std::string>::const_iterator it = selImpl->_recommends.begin(); it != selImpl->_recommends.end(); it++)
-        {
-          Capability _cap = _f.parse( ResTraits<Selection>::kind, *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::list<std::string>::const_iterator it = selImpl->_requires.begin(); it != selImpl->_requires.end(); it++)
-        {
-          Capability _cap = _f.parse( ResTraits<Selection>::kind, *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::list<std::string>::const_iterator it = selImpl->_conflicts.begin(); it != selImpl->_conflicts.end(); it++)
-        {
-          Capability _cap = _f.parse( ResTraits<Selection>::kind, *it );
+       for (std::list<std::string>::const_iterator it = selImpl->_provides.begin(); it != selImpl->_provides.end(); it++)
+       {
+         Capability _cap = _f.parse( ResTraits<Selection>::kind, *it );
+         _deps[Dep::PROVIDES].insert(_cap);
+       }
+
+       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);
-        }
-        NVRAD nvrad = NVRAD( selImpl->_name, Edition(selImpl->_version, selImpl->_release, std::string()), Arch(selImpl->_arch), _deps );
-        result = detail::makeResolvableFromImpl( nvrad, selImpl );
+       }
+
+       for (std::list<std::string>::const_iterator it = selImpl->_obsoletes.begin(); it != selImpl->_obsoletes.end(); it++)
+       {
+         Capability _cap = _f.parse( ResTraits<Selection>::kind, *it );
+         _deps[Dep::OBSOLETES].insert(_cap);
+       }
+
+       NVRAD nvrad = NVRAD( selImpl->_name, Edition(selImpl->_version, selImpl->_release, std::string()), Arch(selImpl->_arch), _deps );
+       result = detail::makeResolvableFromImpl( nvrad, selImpl );
       }
        /////////////////////////////////////////////////////////////////
     } // namespace tagfile

diff --git a/zypp/source/susetags/SuseTagsPatternImpl.h b/zypp/source/susetags/SuseTagsPatternImpl.h
index 137b1b2..5214e17 100644 (file)
--- a/zypp/source/susetags/SuseTagsPatternImpl.h
+++ b/zypp/source/susetags/SuseTagsPatternImpl.h
@@ -77,6 +77,8 @@ namespace zypp
       std::list<std::string> _recommends;
       std::list<std::string> _requires;
       std::list<std::string> _conflicts;
+      std::list<std::string> _provides;
+      std::list<std::string> _obsoletes;
       std::list<std::string> _pkgsuggests;
       std::list<std::string> _pkgrecommends;
       std::list<std::string> _pkgrequires;

diff --git a/zypp/source/susetags/SuseTagsSelectionImpl.h b/zypp/source/susetags/SuseTagsSelectionImpl.h
index 41f6b51..47874fb 100644 (file)
--- a/zypp/source/susetags/SuseTagsSelectionImpl.h
+++ b/zypp/source/susetags/SuseTagsSelectionImpl.h
@@ -77,6 +77,8 @@ namespace zypp
       std::list<std::string> _recommends;
       std::list<std::string> _requires;
       std::list<std::string> _conflicts;
+      std::list<std::string> _provides;
+      std::list<std::string> _obsoletes;
       std::list<std::string> _supported_locales;
       std::map< LanguageCode, std::list<std::string> > _insnotify;
       std::map< LanguageCode, std::list<std::string> > _delnotify;