- so we don't support freshens anymore?

diff --git a/zypp/Dep.cc b/zypp/Dep.cc
index 881ef88..5ec642a 100644 (file)
--- a/zypp/Dep.cc
+++ b/zypp/Dep.cc
@@ -38,7 +38,6 @@ namespace zypp
           _table["obsoletes"]   = Dep::OBSOLETES_e;
           _table["recommends"]  = Dep::RECOMMENDS_e;
           _table["suggests"]    = Dep::SUGGESTS_e;
-          _table["freshens"]    = Dep::FRESHENS_e;
           _table["enhances"]    = Dep::ENHANCES_e;
           _table["supplements"]        = Dep::SUPPLEMENTS_e;
         }
@@ -62,7 +61,6 @@ namespace zypp
   const Dep Dep::OBSOLETES  ( Dep::OBSOLETES_e );
   const Dep Dep::RECOMMENDS ( Dep::RECOMMENDS_e );
   const Dep Dep::SUGGESTS   ( Dep::SUGGESTS_e );
-  const Dep Dep::FRESHENS   ( Dep::FRESHENS_e );
   const Dep Dep::ENHANCES   ( Dep::ENHANCES_e );
   const Dep Dep::SUPPLEMENTS( Dep::SUPPLEMENTS_e );
 
@@ -93,7 +91,6 @@ namespace zypp
         _table[OBSOLETES_e]   = "obsoletes";
         _table[RECOMMENDS_e]  = "recommends";
         _table[SUGGESTS_e]    = "suggests";
-        _table[FRESHENS_e]    = "freshens";
         _table[ENHANCES_e]    = "enhances";
         _table[SUPPLEMENTS_e] = "supplements";
       }

diff --git a/zypp/Dep.h b/zypp/Dep.h
index 5982a1e..5ff7d85 100644 (file)
--- a/zypp/Dep.h
+++ b/zypp/Dep.h
@@ -46,7 +46,6 @@ namespace zypp
     static const Dep OBSOLETES;
     static const Dep RECOMMENDS;
     static const Dep SUGGESTS;
-    static const Dep FRESHENS;
     static const Dep ENHANCES;
     static const Dep SUPPLEMENTS;
     //@}
@@ -62,7 +61,6 @@ namespace zypp
       OBSOLETES_e,
       RECOMMENDS_e,
       SUGGESTS_e,
-      FRESHENS_e,
       ENHANCES_e,
       SUPPLEMENTS_e,
     };

diff --git a/zypp/PoolQuery.cc b/zypp/PoolQuery.cc
index 4d05527..0b7622d 100644 (file)
--- a/zypp/PoolQuery.cc
+++ b/zypp/PoolQuery.cc
@@ -1314,27 +1314,26 @@ attremptycheckend:
       _pimpl->compile();
     if (!a._pimpl->_compiled)
       a._pimpl->compile();
-    if( matchType()!=a.matchType() )
+    if( matchType() != a.matchType() )
       return false;
-    if( a.matchWord()!=matchWord())
+    if( a.matchWord() != matchWord())
       return false;
-    if( a.requireAll()!=requireAll() )
+    if( a.requireAll() != requireAll() )
       return false;
     if(!equalContainers(a.kinds(), kinds()))
       return false;
     if(!equalContainers(a.repos(), repos()))
       return false;
-    if(a._pimpl->_rcstrings!=_pimpl->_rcstrings)
+    if(a._pimpl->_rcstrings != _pimpl->_rcstrings)
       return false;
     if(!equalContainers(a._pimpl->_rcattrs, _pimpl->_rcattrs))
       return false;
-    if(a._pimpl->_cflags!= _pimpl->_cflags)
+    if(a._pimpl->_cflags != _pimpl->_cflags)
       return false;
-    if(a.edition()!=edition())
+    if(a.edition() != edition())
       return false;
-    if(a.editionRel()!= editionRel())
+    if(a.editionRel() != editionRel())
       return false;
-    
 
     return true;
   }

diff --git a/zypp/Resolvable.h b/zypp/Resolvable.h
index 5ca069b..5bcdea4 100644 (file)
--- a/zypp/Resolvable.h
+++ b/zypp/Resolvable.h
@@ -83,7 +83,6 @@ namespace zypp
     using sat::Solvable::obsoletes;
     using sat::Solvable::recommends;
     using sat::Solvable::suggests;
-    using sat::Solvable::freshens;
     using sat::Solvable::enhances;
     using sat::Solvable::supplements;
     using sat::Solvable::prerequires;

diff --git a/zypp/sat/Solvable.cc b/zypp/sat/Solvable.cc
index fa9622f..742459e 100644 (file)
--- a/zypp/sat/Solvable.cc
+++ b/zypp/sat/Solvable.cc
@@ -343,7 +343,6 @@ namespace zypp
         case Dep::OBSOLETES_e:   return obsoletes();   break;
         case Dep::RECOMMENDS_e:  return recommends();  break;
         case Dep::SUGGESTS_e:    return suggests();    break;
-        case Dep::FRESHENS_e:    return freshens();    break;
         case Dep::ENHANCES_e:    return enhances();    break;
         case Dep::SUPPLEMENTS_e: return supplements(); break;
         case Dep::PREREQUIRES_e: return prerequires(); break;
@@ -385,11 +384,6 @@ namespace zypp
       NO_SOLVABLE_RETURN( Capabilities() );
       return _getCapabilities( _solvable->repo->idarraydata, _solvable->suggests );
     }
-    Capabilities Solvable::freshens() const
-    {
-      NO_SOLVABLE_RETURN( Capabilities() );
-      return _getCapabilities( _solvable->repo->idarraydata, _solvable->freshens );
-    }
     Capabilities Solvable::enhances() const
     {
       NO_SOLVABLE_RETURN( Capabilities() );
@@ -549,7 +543,6 @@ namespace zypp
         OUTS(OBSOLETES);
         OUTS(RECOMMENDS);
         OUTS(SUGGESTS);
-        OUTS(FRESHENS);
         OUTS(ENHANCES);
         OUTS(SUPPLEMENTS);
 #undef OUTS

diff --git a/zypp/sat/Solvable.h b/zypp/sat/Solvable.h
index c422a58..937b392 100644 (file)
--- a/zypp/sat/Solvable.h
+++ b/zypp/sat/Solvable.h
@@ -175,7 +175,6 @@ namespace zypp
         Capabilities obsoletes()   const;
         Capabilities recommends()  const;
         Capabilities suggests()    const;
-        Capabilities freshens()    const;
         Capabilities enhances()    const;
         Capabilities supplements() const;
         Capabilities prerequires() const;

diff --git a/zypp/sat/detail/PoolMember.h b/zypp/sat/detail/PoolMember.h
index 3349b7f..1a1d4b7 100644 (file)
--- a/zypp/sat/detail/PoolMember.h
+++ b/zypp/sat/detail/PoolMember.h
@@ -86,8 +86,8 @@ namespace zypp
       /** Internal ids satlib includes in dependencies.
        * MPL check in PoolImpl.cc
       */
-      static const IdType solvablePrereqMarker( 16 );
-      static const IdType solvableFileMarker  ( 17 );
+      static const IdType solvablePrereqMarker( 15 );
+      static const IdType solvableFileMarker  ( 16 );
       /** Test for internal ids satlib includes in dependencies. */
       inline bool isDepMarkerId( IdType id_r )
       { return( id_r == solvablePrereqMarker || id_r == solvableFileMarker ); }

diff --git a/zypp/solver/detail/Testcase.cc b/zypp/solver/detail/Testcase.cc
index a397229..ba49fad 100644 (file)
--- a/zypp/solver/detail/Testcase.cc
+++ b/zypp/solver/detail/Testcase.cc
@@ -201,7 +201,6 @@ std::string helixXML( const PoolItem &item )
   str << helixXML( resolvable, Dep::PREREQUIRES);
   str << helixXML( resolvable, Dep::CONFLICTS);
   str << helixXML( resolvable, Dep::OBSOLETES);
-  str << helixXML( resolvable, Dep::FRESHENS);
   str << helixXML( resolvable, Dep::REQUIRES);
   str << helixXML( resolvable, Dep::RECOMMENDS);
   str << helixXML( resolvable, Dep::ENHANCES);