summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpmdb-more-verbose-error-logging-in-rpmTempFile.patch53
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.4.16.bb1
2 files changed, 54 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpmdb-more-verbose-error-logging-in-rpmTempFile.patch b/meta/recipes-devtools/rpm/rpm/rpmdb-more-verbose-error-logging-in-rpmTempFile.patch
new file mode 100644
index 0000000000..809e54e9cb
--- /dev/null
+++ b/meta/recipes-devtools/rpm/rpm/rpmdb-more-verbose-error-logging-in-rpmTempFile.patch
@@ -0,0 +1,53 @@
1rpmdb: more verbose error logging in rpmTempFile()
2
3Upstream-Status: Inappropriate [debugging]
4
5Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
6
7diff --git a/rpmdb/signature.c b/rpmdb/signature.c
8index dce6c4e..a1d0f06 100644
9--- a/rpmdb/signature.c
10+++ b/rpmdb/signature.c
11@@ -37,6 +37,7 @@ int rpmTempFile(const char * prefix, const char ** fnptr, void * fdptr)
12 int temput;
13 FD_t fd = NULL;
14 unsigned int ran;
15+ int ret = 0;
16
17 if (!prefix) prefix = "";
18
19@@ -44,8 +45,11 @@ int rpmTempFile(const char * prefix, const char ** fnptr, void * fdptr)
20 if (!_initialized) {
21 _initialized = 1;
22 tempfn = rpmGenPath(prefix, tpmacro, NULL);
23- if (rpmioMkpath(tempfn, 0755, (uid_t) -1, (gid_t) -1))
24- goto errxit;
25+ ret = rpmioMkpath(tempfn, 0755, (uid_t) -1, (gid_t) -1);
26+ if (ret) {
27+ rpmlog(RPMLOG_ERR, _("error creating temporary directory %s: %d\n"), tempfn, ret);
28+ goto errxit;
29+ }
30 }
31
32 /* XXX should probably use mkstemp here */
33@@ -68,12 +72,16 @@ int rpmTempFile(const char * prefix, const char ** fnptr, void * fdptr)
34 #endif
35
36 temput = urlPath(tempfn, &tfn);
37- if (*tfn == '\0') goto errxit;
38+ if (*tfn == '\0') {
39+ rpmlog(RPMLOG_ERR, _("error creating tempfile: empty filename\n"));
40+ goto errxit;
41+ }
42
43 switch (temput) {
44 case URL_IS_DASH:
45 case URL_IS_HKP:
46 case URL_IS_MONGO: /* XXX FIXME */
47+ rpmlog(RPMLOG_ERR, _("error creating temporary file, invalid uri type: %d\n"), temput);
48 goto errxit;
49 /*@notreached@*/ /*@switchbreak@*/ break;
50 case URL_IS_HTTPS:
51--
522.6.6
53
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.16.bb b/meta/recipes-devtools/rpm/rpm_5.4.16.bb
index d42724c212..9e2229a082 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.16.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.16.bb
@@ -150,6 +150,7 @@ SRC_URI += " \
150 file://rpm-rpmdb-grammar.patch \ 150 file://rpm-rpmdb-grammar.patch \
151 file://rpm-disable-blaketest.patch \ 151 file://rpm-disable-blaketest.patch \
152 file://rpm-autogen-force.patch \ 152 file://rpm-autogen-force.patch \
153 file://rpmdb-more-verbose-error-logging-in-rpmTempFile.patch \
153" 154"
154 155
155SRC_URI_append_libc-musl = "\ 156SRC_URI_append_libc-musl = "\