From: Michael Andres <ma@suse.de>
Date: Mon, 23 May 2011 10:07:23 +0000 (+0200)
Subject: More rpm-4.9 fixes
X-Git-Tag: 9.1.2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=208863e42e7a84d5406ec5016112768e1716ad9c;p=platform%2Fupstream%2Flibzypp.git

More rpm-4.9 fixes
---

diff --git a/zypp/target/rpm/librpmDb.cc b/zypp/target/rpm/librpmDb.cc
index b623315..d8ae610 100644
--- a/zypp/target/rpm/librpmDb.cc
+++ b/zypp/target/rpm/librpmDb.cc
@@ -40,7 +40,7 @@ public:
 
   const Pathname _root;   // root directory for all operations
   const Pathname _dbPath; // directory (below root) that contains the rpmdb
-  rpmts _ts;     // transaction handle, includes database
+  rpmts _ts;              // transaction handle, includes database
   shared_ptr<RpmException> _error;  // database error
 
   friend ostream & operator<<( ostream & str, const D & obj )
@@ -61,14 +61,14 @@ public:
     int          perms = 0644;
 
     _ts = ::rpmtsCreate();
-    ::rpmtsSetRootDir(ts, _root);
+    ::rpmtsSetRootDir( _ts, _root.c_str() );
 
     // check whether to create a new db
     PathInfo master( _root + _dbPath + "Packages" );
     if ( ! master.isFile() )
     {
       // init database
-      int res = ::rpmtsInit( _ts, perms );
+      int res = ::rpmtsInitDB( _ts, perms );
       if ( res )
       {
         ERR << "rpmdbInit error(" << res << "): " << *this << endl;
@@ -452,51 +452,9 @@ unsigned librpmDb::size() const
   unsigned count = 0;
   if ( valid() )
   {
-#ifndef _RPM_4_4
-    // looks like rpm-4.7 has no public dbi interface anymore
-    int dbi = ::rpmdbOpen("/", &_d._db, O_RDONLY, 0);
-    if (dbi == 0) {
-        rpmdbMatchIterator mi = ::rpmdbInitIterator(_d._db, RPMTAG_NAME, NULL, 0);
-        if (mi != NULL) {
-            for (;;) {
-                Header rpmHeader = ::rpmdbNextIterator(mi);
-                if (rpmHeader != NULL)
-                    ++count;
-            }
-        }
-        ::rpmdbClose(_d._db);
-    }
-#else
-# ifdef RPMDBI_NAME
-    // in rpm < 4.9 RPMDBI_NAME was a define
-    dbiIndex dbi = dbiOpen( _d._db, RPMTAG_NAME, 0 );
-    if ( dbi )
-    {
-      DBC * dbcursor = 0;
-      dbiCopen( dbi, dbi->dbi_txnid, &dbcursor, 0 );
-
-      DBT key, data;
-      memset( &key, 0, sizeof(key) );
-      memset( &data, 0, sizeof(data) );
-      while ( dbiGet( dbi, dbcursor, &key, &data, DB_NEXT ) == 0 )
-        count += data.size / dbi->dbi_jlen;
-
-      dbiCclose( dbi, dbcursor, 0 );
-      /* no need to close dbi */
-    }
-# else
-   // rpm-4.9 case, RPMDBI_NAME is an enum
-   rpmdbIndexIterator ii = rpmdbIndexIteratorInit(rpmtsGetRdb(_d._ts), RPMDBI_NAME);
-   if ( ii )
-   {
-     char * key;
-     size_t keylen;
-     while (rpmdbIndexIteratorNext(ii, &key, &keylen) == 0)
-       count += rpmdbIndexIteratorNumPkgs(ii);
-     rpmdbIndexIteratorFree(ii);
-   }
-# endif
-#endif
+    db_const_iterator it( this );
+    for ( db_const_iterator it( this ); *it; ++it )
+      ++count;
   }
   return count;
 }
diff --git a/zypp/target/rpm/librpmDb.h b/zypp/target/rpm/librpmDb.h
index b3f679f..7bfbd34 100644
--- a/zypp/target/rpm/librpmDb.h
+++ b/zypp/target/rpm/librpmDb.h
@@ -86,7 +86,7 @@ private:
   /**
    * For internal use. Pointer returned should immediately be
    * wrapped into librpmDb::Ptr.
-  *
+   *
    * \throws RpmException
    *
    **/
@@ -100,7 +100,7 @@ private:
    * outstanding reference goes out of scope. If no external reference is
    * created, you'll have to explicitly call @ref dbRelease to close the
    * database.
-  *
+   *
    * \throws RpmException
    *
    **/