summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/libzypp/libzypp
diff options
context:
space:
mode:
authorQing He <qing.he@intel.com>2011-01-11 16:40:04 +0800
committerSaul Wold <sgw@linux.intel.com>2011-01-30 12:09:52 -0800
commit483ee172cf522969a7e5eb7f81ba2be412db9ee4 (patch)
tree5b5db49d3023fa27e18f63550f0e1968fd5312bd /meta/recipes-extended/libzypp/libzypp
parent2c32f494ccf1721d0888bde59be41ba05e221d33 (diff)
downloadpoky-483ee172cf522969a7e5eb7f81ba2be412db9ee4.tar.gz
libzypp: upgrade to newer git version
this works with rpm 5.4.0 Signed-off-by: Qing He <qing.he@intel.com>
Diffstat (limited to 'meta/recipes-extended/libzypp/libzypp')
-rw-r--r--meta/recipes-extended/libzypp/libzypp/rpm5-no-rpmdbinit.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/meta/recipes-extended/libzypp/libzypp/rpm5-no-rpmdbinit.patch b/meta/recipes-extended/libzypp/libzypp/rpm5-no-rpmdbinit.patch
new file mode 100644
index 0000000000..f15bb68d51
--- /dev/null
+++ b/meta/recipes-extended/libzypp/libzypp/rpm5-no-rpmdbinit.patch
@@ -0,0 +1,25 @@
1diff --git a/zypp/target/rpm/librpmDb.cc b/zypp/target/rpm/librpmDb.cc
2index 1689fbb..4999cd9 100644
3--- a/zypp/target/rpm/librpmDb.cc
4+++ b/zypp/target/rpm/librpmDb.cc
5@@ -60,20 +60,6 @@ public:
6 const char * root = ( _root == "/" ? NULL : _root.asString().c_str() );
7 int perms = 0644;
8
9- // check whether to create a new db
10- PathInfo master( _root + _dbPath + "Packages" );
11- if ( ! master.isFile() )
12- {
13- // init database
14- int res = ::rpmdbInit( root, perms );
15- if ( res )
16- {
17- ERR << "rpmdbInit error(" << res << "): " << *this << endl;
18- _error = shared_ptr<RpmInitException>(new RpmInitException(_root, _dbPath));
19- ZYPP_THROW(*_error);
20- }
21- }
22-
23 // open database
24 int res = ::rpmdbOpen( root, &_db, (readonly_r ? O_RDONLY : O_RDWR ), perms );
25 if ( res || !_db )