summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES1
-rw-r--r--lib/psm.c8
2 files changed, 5 insertions, 4 deletions
diff --git a/CHANGES b/CHANGES
index 617e8e8cc..a6e0853d6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -22,6 +22,7 @@
- fix: permit sqlite3 rpmdb with chroot (#159424).
- fix: find-debuginfo.sh not handling set[ug]id ELF files (#100963).
- fix: find-debuginfo.sh kernel voo-doo tweaks (#159346).
+ - fix: initialize variables used in debug msg (#160458).
4.4 -> 4.4.1:
- force *.py->*.pyo byte code compilation with brp-python-bytecompile.
diff --git a/lib/psm.c b/lib/psm.c
index 2a14a5252..c57c15405 100644
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -632,6 +632,10 @@ static rpmRC runScript(rpmpsm psm, Header h, const char * sln,
if (progArgv == NULL && script == NULL)
return rc;
+ /* XXX FIXME: except for %verifyscript, rpmteNEVR can be used. */
+ xx = headerNVR(h, &n, &v, &r);
+ xx = hge(h, RPMTAG_ARCH, NULL, (void **) &a, NULL);
+
if (progArgv && strcmp(progArgv[0], "<lua>") == 0) {
rpmMessage(RPMMESS_DEBUG,
_("%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"),
@@ -642,10 +646,6 @@ static rpmRC runScript(rpmpsm psm, Header h, const char * sln,
psm->sq.reaper = 1;
- /* XXX FIXME: except for %verifyscript, rpmteNEVR can be used. */
- xx = headerNVR(h, &n, &v, &r);
- xx = hge(h, RPMTAG_ARCH, NULL, (void **) &a, NULL);
-
/* XXX bash must have functional libtermcap.so.2 */
if (!strcmp(n, "libtermcap"))
ldconfig_done = 0;