[packages/rpm] - make DB_BUFFER_SMALL workaround loud again, hiding this issue won't help us find a reproducer an
baggins
baggins at pld-linux.org
Thu Oct 25 08:58:51 CEST 2012
commit 3346e1760a053956546755039b2adb5b70f75338
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Thu Oct 25 08:57:47 2012 +0200
- make DB_BUFFER_SMALL workaround loud again, hiding this issue
won't help us find a reproducer and/or fix it
- rel 28
rpm-db_buffer_small.patch | 8 ++++----
rpm.spec | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index f07f0fb..d705983 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -52,7 +52,7 @@ Summary(ru.UTF-8): Менеджер пакетов от RPM
Summary(uk.UTF-8): Менеджер пакетів від RPM
Name: rpm
Version: 5.4.10
-Release: 27
+Release: 28
License: LGPL
Group: Base
# http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.10-0.20120706.src.rpm
diff --git a/rpm-db_buffer_small.patch b/rpm-db_buffer_small.patch
index 0ca794a..13177cf 100644
--- a/rpm-db_buffer_small.patch
+++ b/rpm-db_buffer_small.patch
@@ -47,7 +47,7 @@ Index: rpm-5.4.9/rpmdb/rpmdb.c
+ fprintf(stderr, "==> DB_BUFFER_SMALL orig requested (%d), configured (%d), forcing larger buffer (%d), new size (%d)\n",
+ origlen, vp->ulen, uhlen, vp->size);
+ else
-+ rpmlog(RPMLOG_DEBUG, D_("==> retry (%d) db3cpget (%d)"), retry, uhlen);
++ fprintf(stderr, "==> retry (%d) db3cpget (%d)", retry, uhlen);
+ goto retry_get;
+ }
+ }
@@ -56,7 +56,7 @@ Index: rpm-5.4.9/rpmdb/rpmdb.c
+ fprintf(stderr, "==> success orig requested (%d), configured buffer (%d), buffer (%d), size after dbiGet (%d)\n",
+ origlen, vp->ulen, uhlen, vp->size);
+ else
-+ rpmlog(RPMLOG_DEBUG, D_("==> success"));
++ fprintf(stderr, "==> success");
}
}
} else
@@ -68,8 +68,8 @@ Index: rpm-5.4.9/rpmdb/db3.c
rc = dbcursor->pget(dbcursor, key, pkey, data, flags);
/* XXX DB_NOTFOUND can be returned */
_printit = (rc == DB_NOTFOUND ? 0 : _debug);
-+ /* XXX Permit DB_BUFFER_SMALL to be returned (more restrictive?) */
-+ _printit = (rc == DB_BUFFER_SMALL ? 0 : _printit);
++// /* XXX Permit DB_BUFFER_SMALL to be returned (more restrictive?) */
++// _printit = (rc == DB_BUFFER_SMALL ? 0 : _printit);
rc = cvtdberr(dbi, "dbcursor->pget", rc, _printit);
#else
/* XXX db3 does DB_FIRST on uninitialized cursor */
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/3346e1760a053956546755039b2adb5b70f75338
More information about the pld-cvs-commit
mailing list