rpms/rpm
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Fall back to private db environment on filesystems not supporting mmap()

Browse Source 
- Adjust posttrans script wrt bdb string change (#803866, #805613)
This commit is contained in:
Panu Matilainen 2012-05-07 12:58:11 +03:00
parent 9d3171c03f
commit 98d67b23f7
2 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
rpm-4.9.x-db-einval.patch Normal file
View File

@ -0,0 +1,37 @@
commit 58c5eb28d5f267313294486c6f8a7a6c84984d86
Author: Panu Matilainen <pmatilai@redhat.com>
Date: Thu May 3 16:15:59 2012 +0300
Fall back to private db environment on system level EINVAL
- BDB wants to use mmap() for its environment by default, but not
all (file)systems support this, as pointed out by Daniel Drak.
However env->open() can return EINVAL for a number of reasons,
require all the fallback reasons to be system level errors to
differentiate from "logical" errors such as incompatible flags
to (possibly pre-existing) db environment, in which case we better
just error out.
diff --git a/lib/backend/db3.c b/lib/backend/db3.c
index 30ed7ac..bbf9577 100644
--- a/lib/backend/db3.c
+++ b/lib/backend/db3.c
@@ -177,7 +177,8 @@ static int db_init(rpmdb rdb, const char * dbhome)
/*
* Actually open the environment. Fall back to private environment
- * if we dont have permission to join/create shared environment.
+ * if we dont have permission to join/create shared environment or
+ * system doesn't support it..
*/
while (retry_open) {
char *fstr = prDbiOpenFlags(eflags, 1);
@@ -185,7 +186,7 @@ static int db_init(rpmdb rdb, const char * dbhome)
free(fstr);
rc = (dbenv->open)(dbenv, dbhome, eflags, rdb->db_perms);
- if (rc == EACCES || rc == EROFS) {
+ if ((rc == EACCES || rc == EROFS || rc == EINVAL) && errno == rc) {
eflags |= DB_PRIVATE;
retry_open--;
} else {

10
rpm.spec
View File

@ -21,7 +21,7 @@
Summary: The RPM package management system
Name: rpm
Version: %{rpmver}
Release: %{?snapver:0.%{snapver}.}6%{?dist}
Release: %{?snapver:0.%{snapver}.}7%{?dist}
Group: System Environment/Base
Url: http://www.rpm.org/
Source0: http://rpm.org/releases/rpm-4.9.x/%{name}-%{srcver}.tar.bz2
@ -59,6 +59,7 @@ Patch107: rpm-4.9.x-include-cond.patch
Patch108: rpm-4.9.x-exclude-warn.patch
Patch109: rpm-4.9.x-tstest-fileinfo.patch
Patch110: rpm-4.9.1.2-ppc64p7.patch
Patch111: rpm-4.9.x-db-einval.patch
# These are not yet upstream
Patch301: rpm-4.6.0-niagara.patch
@ -247,6 +248,7 @@ packages on a system.
%patch108 -p1 -b .exclude-warn
%patch109 -p1 -b .tstest-fileinfo
%patch110 -p1 -b .ppc64p7
%patch111 -p1 -b .db-einval
%patch301 -p1 -b .niagara
%patch302 -p1 -b .geode
@ -364,7 +366,7 @@ make check
# XXX this is klunky and ugly, rpm itself should handle this
dbstat=/usr/lib/rpm/rpmdb_stat
if [ -x "$dbstat" ]; then
if "$dbstat" -e -h /var/lib/rpm 2>&1 | grep -q "doesn't match environment version \| Invalid argument"; then
if "$dbstat" -e -h /var/lib/rpm 2>&1 | grep -q "doesn't match library version \| Invalid argument"; then
rm -f /var/lib/rpm/__db.*
fi
fi
@ -479,6 +481,10 @@ exit 0
%doc COPYING doc/librpm/html/*
%changelog
* Mon May 07 2012 Panu Matilainen <pmatilai@redhat.com> - 4.9.1.3-7
- Fall back to private db environment on filesystems not supporting mmap()
- Adjust posttrans script wrt bdb string change (#803866, #805613)
* Thu May 03 2012 Phil Knirsch <pknirsch@redhat.com> 4.9.1.3-6
- Arch macro for all supported PowerPC 64 processors (#818320)