summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rpm/rpm/rpm-solvedb.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/rpm-solvedb.patch')
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-solvedb.patch31
1 files changed, 0 insertions, 31 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-solvedb.patch b/meta/recipes-devtools/rpm/rpm/rpm-solvedb.patch
deleted file mode 100644
index d6f43a2c06..0000000000
--- a/meta/recipes-devtools/rpm/rpm/rpm-solvedb.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1Increase the maximum number of solver databases!
2
3Previously the max was set to 5, up this to 20... this should be more
4then enough for now.. also add an RPM_ERROR message in case we exceed the
5new maximum.
6
7Upstream-Status: Pending
8
9Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
10
11diff -urN rpm-5.4.0.orig/rpmio/rpmbag.c rpm-5.4.0/rpmio/rpmbag.c
12--- rpm-5.4.0.orig/rpmio/rpmbag.c 2010-10-17 21:43:55.000000000 -0500
13+++ rpm-5.4.0/rpmio/rpmbag.c 2011-02-18 18:46:00.246892502 -0600
14@@ -16,7 +16,7 @@
15 /*@unchecked@*/
16 int _rpmbag_debug = 0;
17
18-static size_t _maxnsdbp = 5;
19+static size_t _maxnsdbp = 20;
20
21 static void rpmbagFini(void * _bag)
22 /*@globals fileSystem @*/
23@@ -70,6 +70,8 @@
24 sdbp[i] = xcalloc(1, sizeof(*sdbp[i]));
25 sdbp[i]->dbmode = dbmode;
26 sdbp[i]->_db = _db;
27+ } else if (bag && bag->sdbp && bag->nsdbp >= _maxnsdbp) {
28+ rpmlog(RPMLOG_ERR, _("Attempted to open more then %d solver databases. Increase _maxnsdbp in rpmio/rpmbag.c\n"), _maxnsdbp);
29 }
30
31 return 0;