keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libpriv/scripts: Fix uint64 printing

Browse Source 
Yet more print format issues uncovered by users running on armv7.

Also add a space between the specifier and the "ms" because it makes one
doubtful whether printf interprets this correctly.

I think this will resolve
https://bugzilla.redhat.com/show_bug.cgi?id=1906184.
This commit is contained in:
Jonathan Lebon 2020-12-09 16:05:39 -05:00 committed by OpenShift Merge Robot
parent f1488e52f0
commit 36614aeab2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libpriv/rpmostree-scripts.c
View File

@ -651,7 +651,7 @@ impl_run_rpm_script (const KnownRpmScriptKind *rpmscript,
guint64 elapsed_ms = end_time_ms - start_time_ms;
sd_journal_send ("MESSAGE_ID=" SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL(RPMOSTREE_MESSAGE_PREPOST),
"MESSAGE=Executed %s for %s in %ums", rpmscript->desc, dnf_package_get_name (pkg), elapsed_ms,
"MESSAGE=Executed %s for %s in %" G_GUINT64_FORMAT " ms", rpmscript->desc, dnf_package_get_name (pkg), elapsed_ms,
"SCRIPT_TYPE=%s", rpmscript->desc,
"PKG=%s", dnf_package_get_name (pkg),
"EXEC_TIME_MS=%" G_GUINT64_FORMAT, elapsed_ms,
@ -1018,7 +1018,7 @@ rpmostree_transfiletriggers_run_sync (Header hdr,
(*out_n_run)++;
sd_journal_send ("MESSAGE_ID=" SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL(RPMOSTREE_MESSAGE_FILETRIGGER),
"MESSAGE=Executed %%transfiletriggerin(%s) for %s in %ums; %u matched files",
"MESSAGE=Executed %%transfiletriggerin(%s) for %s in %" G_GUINT64_FORMAT " ms; %u matched files",
pkg_name, patterns_joined->str, elapsed_ms, n_total_matched,
"SCRIPT_TYPE=%%transfiletriggerin"
"PKG=%s", pkg_name,