Provide product::updaterepoKey: Update repository indicator string.

diff --git a/VERSION.cmake b/VERSION.cmake
index c05ba1dc6f90de446938272d4729daf2ca77632c..3099822643cbfe759b0d75901a3826310a83d6a6 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -60,7 +60,7 @@
 #
 SET(LIBZYPP_MAJOR "5")
 SET(LIBZYPP_COMPATMINOR "8")
-SET(LIBZYPP_MINOR "8")
+SET(LIBZYPP_MINOR "9")
 SET(LIBZYPP_PATCH "0")
 #
 # LAST RELEASED: 5.8.0 (8)

diff --git a/devel/devel.ma/NewPool.cc b/devel/devel.ma/NewPool.cc
index d64f09309759bdc0064f2c6b90ec375c08e58408..e41f7d1ff282ec4eab0b9a8b955bc64faf1c1cf3 100644 (file)
--- a/devel/devel.ma/NewPool.cc
+++ b/devel/devel.ma/NewPool.cc
@@ -443,20 +443,19 @@ try {
   INT << "===[START]==========================================" << endl;
   ZConfig::instance();
 
+#if 0
   ServiceInfo s( "STest", Url("dir:///somewhere") );
   DBG << s << endl;
   s.addCatalogToEnable( "foo" );
   s.addCatalogToEnable( "ba a" );
   s.addCatalogToEnable( "kaa" );
   DBG << s << endl;
-  s.delCatalogToEnable( "kaa" );
-  DBG << s << endl;
 
   ///////////////////////////////////////////////////////////////////
   INT << "===[END]============================================" << endl << endl;
   zypp::base::LogControl::instance().logNothing();
   return 0;
-
+#endif
 
   ResPool   pool( ResPool::instance() );
   sat::Pool satpool( sat::Pool::instance() );
@@ -474,7 +473,7 @@ try {
     }
   }
 
-  if ( 1 )
+  if ( 0 )
   {
     RepoManager repoManager( makeRepoManager( sysRoot ) );
     RepoInfoList repos = repoManager.knownRepositories();

diff --git a/package/libzypp.changes b/package/libzypp.changes
index d689ddbf660a2b13bbf574331e23c05b2daf0494..0ed29ca00aa4c1ae1160fa04e5429be3e2b43679 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Sep 10 16:40:00 CEST 2008 - ma@suse.de
+
+- Provide product::updaterepoKey: Update repository indicator string.
+- revision 11000
+
 -------------------------------------------------------------------
 Tue Sep  9 17:33:03 CEST 2008 - dmacvicar@suse.de
 

diff --git a/zypp/Product.cc b/zypp/Product.cc
index e7e98edb9b133baa6368135e15f6b7a8123b96c5..24d9ea49944dcadc94d48618333fa314ce9d899c 100644 (file)
--- a/zypp/Product.cc
+++ b/zypp/Product.cc
@@ -88,13 +88,14 @@ namespace zypp
       return sat::Solvable::noSolvable;
     }
 
-
     // if there is productReferences defined, we expect
-    // a matching package within the same repo.
+    // a matching package within the same repo. And of
+    // same arch.
     sat::WhatProvides providers( identCap );
     for_( it, providers.begin(), providers.end() )
     {
-      if ( it->repository() == repository() )
+      if ( it->repository() == repository()
+           && it->arch() == arch() )
         return *it;
     }
 
@@ -140,6 +141,9 @@ namespace zypp
   std::string Product::type() const
   { return lookupStrAttribute( sat::SolvAttr::productType ); }
 
+  std::string Product::updaterepoKey() const
+  { return lookupStrAttribute( sat::SolvAttr::productUpdaterepoKey ); }
+
   Url Product::releaseNotesUrl() const
   {
     std::list<Url> ret;

diff --git a/zypp/Product.h b/zypp/Product.h
index fd2a65fa7d9635fbf2b22f21dd90de21052a52cd..746bb13a81be10a36196856d989bb2f50cb0ea48 100644 (file)
--- a/zypp/Product.h
+++ b/zypp/Product.h
@@ -66,6 +66,13 @@ namespace zypp
     */
     std::string type() const;
 
+    /** Update repository indicator string.
+     * Repositories providing updates/patches for this product
+     * should (somehow) provide this string. So we are able to
+     * detect them.
+     */
+    std::string updaterepoKey() const;
+
     /** The URL to download the release notes for this product */
     Url releaseNotesUrl() const;
 
@@ -91,6 +98,7 @@ namespace zypp
     /** The product flags */
     std::list<std::string> flags() const;
 
+
     /** Translated long name like <tt>SUSE Linux Enterprise Server 10</tt>
      * \deprecated use summary.
      */

diff --git a/zypp/sat/SolvAttr.cc b/zypp/sat/SolvAttr.cc
index 188ecf493d2d202952877c4a9ec9670cb0dd3b22..a25ef1bae7efc195c85abc542492f7193a1057a1 100644 (file)
--- a/zypp/sat/SolvAttr.cc
+++ b/zypp/sat/SolvAttr.cc
@@ -97,7 +97,6 @@ namespace sat
   const SolvAttr SolvAttr::extends      ( SOLVABLE_EXTENDS );
 
   // product
-  const SolvAttr SolvAttr::productReferences   ( PRODUCT_REFERENCES );
   const SolvAttr SolvAttr::productShortlabel   ( PRODUCT_SHORTLABEL );
   const SolvAttr SolvAttr::productDistproduct  ( PRODUCT_DISTPRODUCT );
   const SolvAttr SolvAttr::productDistversion  ( PRODUCT_DISTVERSION );
@@ -108,6 +107,8 @@ namespace sat
   const SolvAttr SolvAttr::productOptionalurls ( PRODUCT_OPTIONALURLS );
   const SolvAttr SolvAttr::productFlags        ( PRODUCT_FLAGS );
   const SolvAttr SolvAttr::productFlavor       ( PRODUCT_FLAVOR );
+  const SolvAttr SolvAttr::productReferences   ( PRODUCT_REFERENCES );
+  const SolvAttr SolvAttr::productUpdaterepoKey( PRODUCT_UPDATEREPOKEY );
 
   // repository
   const SolvAttr SolvAttr::repositoryTimestamp ( REPOSITORY_TIMESTAMP );

diff --git a/zypp/sat/SolvAttr.h b/zypp/sat/SolvAttr.h
index d0ffaa2b0d85de56eab7596266c6b97cf5090393..6e1dbdfa2cf45b4abc576417a0a8a6676326f315 100644 (file)
--- a/zypp/sat/SolvAttr.h
+++ b/zypp/sat/SolvAttr.h
@@ -122,7 +122,6 @@ namespace sat
 
       /** \name product */
       //@{
-      static const SolvAttr productReferences; // the package providing the metadata
       static const SolvAttr productShortlabel;
       static const SolvAttr productDistproduct;
       static const SolvAttr productDistversion;
@@ -133,6 +132,8 @@ namespace sat
       static const SolvAttr productOptionalurls;
       static const SolvAttr productFlags;
       static const SolvAttr productFlavor;
+      static const SolvAttr productReferences; // the package providing the metadata
+      static const SolvAttr productUpdaterepoKey;
       //@}
 
       /** \name repository */