| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | rpmdb: more verbose error logging in rpmTempFile() |
| 2 | |
| 3 | Upstream-Status: Inappropriate [debugging] |
| 4 | |
| 5 | Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> |
| 6 | |
| 7 | diff --git a/rpmdb/signature.c b/rpmdb/signature.c |
| 8 | index 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 | -- |
| 52 | 2.6.6 |
| 53 | |