aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2019-06-13 20:13:57 +0200
committerFabian Groffen <grobian@gentoo.org>2019-06-13 20:13:57 +0200
commitb2418b1406551ce5b540aaf8d332ec53ddd52e01 (patch)
tree348451de106dd6eea6a874023cc90d401f70a9ac /qcheck.c
parenttests/qmanifest: allow gpg_import to fail (diff)
downloadportage-utils-b2418b1406551ce5b540aaf8d332ec53ddd52e01.tar.gz
portage-utils-b2418b1406551ce5b540aaf8d332ec53ddd52e01.tar.bz2
portage-utils-b2418b1406551ce5b540aaf8d332ec53ddd52e01.zip
libq/atom: make atom_format smarter to unbreak Puppet
The default portage provider in Puppet uses qatom in a rather clumpsy way. The newer formatting broke it because they don't use explicit formatting. Make atom_format somewhat smarter to unbreak Puppet's usage. Signed-off-by: Fabian Groffen <grobian@gentoo.org>
Diffstat (limited to 'qcheck.c')
-rw-r--r--qcheck.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/qcheck.c b/qcheck.c
index efbb191d..8eb1f088 100644
--- a/qcheck.c
+++ b/qcheck.c
@@ -98,7 +98,7 @@ qcheck_process_contents(tree_pkg_ctx *pkg_ctx, struct qcheck_opt_state *state)
num_files = num_files_ok = num_files_unknown = num_files_ignored = 0;
qcprintf("%sing %s ...\n",
(state->qc_update ? "Updat" : "Check"),
- atom_format("%[CATEGORY]%[PF]", atom, 0));
+ atom_format("%[CATEGORY]%[PF]", atom));
if (state->qc_update) {
fp_contents_update = tree_pkg_vdb_fopenat_rw(pkg_ctx, "CONTENTS~");
if (fp_contents_update == NULL) {
@@ -331,9 +331,9 @@ qcheck_process_contents(tree_pkg_ctx *pkg_ctx, struct qcheck_opt_state *state)
}
if (state->bad_only && num_files_ok != num_files) {
if (verbose)
- printf("%s\n", atom_format("%[CATEGORY]%[PF]", atom, 0));
+ printf("%s\n", atom_format("%[CATEGORY]%[PF]", atom));
else {
- printf("%s\n", atom_format("%[CATEGORY]%[PN]", atom, 0));
+ printf("%s\n", atom_format("%[CATEGORY]%[PN]", atom));
}
}
qcprintf(" %2$s*%1$s %3$s%4$zu%1$s out of %3$s%5$zu%1$s file%6$s are good",