blob: 43e9859ef32cacb4cbc12f993fa5f4cac448cc73 [file] [log] [blame]
Brad Bishop19323692019-04-05 15:28:33 -04001From 989e425d416474c191b020d0825895e3df4bd033 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 10 Jan 2019 18:14:18 +0100
4Subject: [PATCH] rpmscript.c: change logging level around scriptlets to INFO
5 from DEBUG
6
7That way we can debug scriptlet failures without writing lots of
8irrelevant noise to rootfs logs.
9
10Upstream-Status: Inappropriate [oe-core specific]
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12---
13 lib/rpmscript.c | 8 ++++----
14 1 file changed, 4 insertions(+), 4 deletions(-)
15
16diff --git a/lib/rpmscript.c b/lib/rpmscript.c
17index 2b0e43862..e319673f1 100644
18--- a/lib/rpmscript.c
19+++ b/lib/rpmscript.c
20@@ -226,7 +226,7 @@ static char * writeScript(const char *cmd, const char *script)
21 if (Ferror(fd))
22 goto exit;
23
24- if (rpmIsDebug() && (rstreq(cmd, "/bin/sh") || rstreq(cmd, "/bin/bash"))) {
25+ if (rpmIsVerbose() && (rstreq(cmd, "/bin/sh") || rstreq(cmd, "/bin/bash"))) {
26 static const char set_x[] = "set -x\n";
27 /* Assume failures will be caught by the write below */
28 Fwrite(set_x, sizeof(set_x[0]), sizeof(set_x)-1, fd);
29@@ -258,7 +258,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes,
30 char *mline = NULL;
31 rpmRC rc = RPMRC_FAIL;
32
33- rpmlog(RPMLOG_DEBUG, "%s: scriptlet start\n", sname);
34+ rpmlog(RPMLOG_INFO, "%s: scriptlet start\n", sname);
35
36 if (script) {
37 fn = writeScript(*argvp[0], script);
38@@ -310,7 +310,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes,
39 sname, strerror(errno));
40 goto exit;
41 } else if (pid == 0) {/* Child */
42- rpmlog(RPMLOG_DEBUG, "%s: execv(%s) pid %d\n",
43+ rpmlog(RPMLOG_INFO, "%s: execv(%s) pid %d\n",
44 sname, *argvp[0], (unsigned)getpid());
45
46 fclose(in);
47@@ -353,7 +353,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes,
48 reaped = waitpid(pid, &status, 0);
49 } while (reaped == -1 && errno == EINTR);
50
51- rpmlog(RPMLOG_DEBUG, "%s: waitpid(%d) rc %d status %x\n",
52+ rpmlog(RPMLOG_INFO, "%s: waitpid(%d) rc %d status %x\n",
53 sname, (unsigned)pid, (unsigned)reaped, status);
54
55 if (reaped < 0) {