Mailinglist Archive: zypp-commit (223 mails)

< Previous Next >
[zypp-commit] r10643 - in /trunk/libzypp/zypp: Dep.cc Dep.h PoolQuery.cc Resolvable.h sat/Solvable.cc sat/Solvable.h sat/detail/PoolMember.h solver/detail/Testcase.cc
  • From: jkupec@xxxxxxxxxxxxxxxx
  • Date: Tue, 22 Jul 2008 15:16:19 -0000
  • Message-id: <20080722151619.BD0702A1D4@xxxxxxxxxxxxxxxx>
Author: jkupec
Date: Tue Jul 22 17:16:19 2008
New Revision: 10643

URL: http://svn.opensuse.org/viewcvs/zypp?rev=10643&view=rev
Log:
- so we don't support freshens anymore?

Modified:
trunk/libzypp/zypp/Dep.cc
trunk/libzypp/zypp/Dep.h
trunk/libzypp/zypp/PoolQuery.cc
trunk/libzypp/zypp/Resolvable.h
trunk/libzypp/zypp/sat/Solvable.cc
trunk/libzypp/zypp/sat/Solvable.h
trunk/libzypp/zypp/sat/detail/PoolMember.h
trunk/libzypp/zypp/solver/detail/Testcase.cc

Modified: trunk/libzypp/zypp/Dep.cc
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Dep.cc?rev=10643&r1=10642&r2=10643&view=diff
==============================================================================
--- trunk/libzypp/zypp/Dep.cc (original)
+++ trunk/libzypp/zypp/Dep.cc Tue Jul 22 17:16:19 2008
@@ -38,7 +38,6 @@
_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 @@
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 @@
_table[OBSOLETES_e] = "obsoletes";
_table[RECOMMENDS_e] = "recommends";
_table[SUGGESTS_e] = "suggests";
- _table[FRESHENS_e] = "freshens";
_table[ENHANCES_e] = "enhances";
_table[SUPPLEMENTS_e] = "supplements";
}

Modified: trunk/libzypp/zypp/Dep.h
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Dep.h?rev=10643&r1=10642&r2=10643&view=diff
==============================================================================
--- trunk/libzypp/zypp/Dep.h (original)
+++ trunk/libzypp/zypp/Dep.h Tue Jul 22 17:16:19 2008
@@ -46,7 +46,6 @@
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 @@
OBSOLETES_e,
RECOMMENDS_e,
SUGGESTS_e,
- FRESHENS_e,
ENHANCES_e,
SUPPLEMENTS_e,
};

Modified: trunk/libzypp/zypp/PoolQuery.cc
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PoolQuery.cc?rev=10643&r1=10642&r2=10643&view=diff
==============================================================================
--- trunk/libzypp/zypp/PoolQuery.cc (original)
+++ trunk/libzypp/zypp/PoolQuery.cc Tue Jul 22 17:16:19 2008
@@ -1314,27 +1314,26 @@
_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;
}

Modified: trunk/libzypp/zypp/Resolvable.h
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Resolvable.h?rev=10643&r1=10642&r2=10643&view=diff
==============================================================================
--- trunk/libzypp/zypp/Resolvable.h (original)
+++ trunk/libzypp/zypp/Resolvable.h Tue Jul 22 17:16:19 2008
@@ -83,7 +83,6 @@
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;

Modified: trunk/libzypp/zypp/sat/Solvable.cc
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/Solvable.cc?rev=10643&r1=10642&r2=10643&view=diff
==============================================================================
--- trunk/libzypp/zypp/sat/Solvable.cc (original)
+++ trunk/libzypp/zypp/sat/Solvable.cc Tue Jul 22 17:16:19 2008
@@ -343,7 +343,6 @@
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 @@
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 @@
OUTS(OBSOLETES);
OUTS(RECOMMENDS);
OUTS(SUGGESTS);
- OUTS(FRESHENS);
OUTS(ENHANCES);
OUTS(SUPPLEMENTS);
#undef OUTS

Modified: trunk/libzypp/zypp/sat/Solvable.h
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/Solvable.h?rev=10643&r1=10642&r2=10643&view=diff
==============================================================================
--- trunk/libzypp/zypp/sat/Solvable.h (original)
+++ trunk/libzypp/zypp/sat/Solvable.h Tue Jul 22 17:16:19 2008
@@ -175,7 +175,6 @@
Capabilities obsoletes() const;
Capabilities recommends() const;
Capabilities suggests() const;
- Capabilities freshens() const;
Capabilities enhances() const;
Capabilities supplements() const;
Capabilities prerequires() const;

Modified: trunk/libzypp/zypp/sat/detail/PoolMember.h
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/detail/PoolMember.h?rev=10643&r1=10642&r2=10643&view=diff
==============================================================================
--- trunk/libzypp/zypp/sat/detail/PoolMember.h (original)
+++ trunk/libzypp/zypp/sat/detail/PoolMember.h Tue Jul 22 17:16:19 2008
@@ -86,8 +86,8 @@
/** 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 ); }

Modified: trunk/libzypp/zypp/solver/detail/Testcase.cc
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Testcase.cc?rev=10643&r1=10642&r2=10643&view=diff
==============================================================================
--- trunk/libzypp/zypp/solver/detail/Testcase.cc (original)
+++ trunk/libzypp/zypp/solver/detail/Testcase.cc Tue Jul 22 17:16:19 2008
@@ -201,7 +201,6 @@
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);

--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages