summaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
Diffstat (limited to 'build')
-rw-r--r--build/build.c4
-rw-r--r--build/files.c10
-rw-r--r--build/names.c2
-rw-r--r--build/pack.c4
-rw-r--r--build/rpmfc.c14
5 files changed, 17 insertions, 17 deletions
diff --git a/build/build.c b/build/build.c
index abd631dab..01312a48e 100644
--- a/build/build.c
+++ b/build/build.c
@@ -215,7 +215,7 @@ fprintf(stderr, "*** addMacros\n");
buildCmd = rpmExpand(mCmd, " ", buildScript, NULL);
(void) poptParseArgvString(buildCmd, &argc, &argv);
- rpmMessage(RPMMESS_NORMAL, _("Executing(%s): %s\n"), name, buildCmd);
+ rpmlog(RPMMESS_NORMAL, _("Executing(%s): %s\n"), name, buildCmd);
if (!(child = fork())) {
errno = 0;
@@ -340,7 +340,7 @@ int buildSpec(rpmts ts, rpmSpec spec, int what, int test)
exit:
if (rc && rpmlogGetNrecs() > 0) {
- rpmMessage(RPMMESS_NORMAL, _("\n\nRPM build errors:\n"));
+ rpmlog(RPMMESS_NORMAL, _("\n\nRPM build errors:\n"));
rpmlogPrint(NULL);
}
diff --git a/build/files.c b/build/files.c
index f8ea9f9df..e2efeb909 100644
--- a/build/files.c
+++ b/build/files.c
@@ -248,7 +248,7 @@ static void timeCheck(int tc, Header h)
for (x = 0; x < count; x++) {
if ((currentTime - mtime[x]) > tc)
- rpmMessage(RPMMESS_WARNING, _("TIMECHECK failure: %s\n"), files[x]);
+ rpmlog(RPMMESS_WARNING, _("TIMECHECK failure: %s\n"), files[x]);
}
files = hfd(files, fnt);
}
@@ -1071,7 +1071,7 @@ static void genCpioListAndHeader(FileList fl,
flp[1].flags |= flp->flags;
if (!(flp[1].flags & RPMFILE_EXCLUDE))
- rpmMessage(RPMMESS_WARNING, _("File listed twice: %s\n"),
+ rpmlog(RPMMESS_WARNING, _("File listed twice: %s\n"),
flp->fileURL);
/* file mode */
@@ -2253,7 +2253,7 @@ static int checkFiles(StringBuf fileList)
}
rc = 0;
- rpmMessage(RPMMESS_NORMAL, _("Checking for unpackaged file(s): %s\n"), s);
+ rpmlog(RPMMESS_NORMAL, _("Checking for unpackaged file(s): %s\n"), s);
rc = rpmfcExec(av_ckfile, fileList, &sb_stdout, 0);
if (rc < 0)
@@ -2267,7 +2267,7 @@ static int checkFiles(StringBuf fileList)
t = getStringBuf(sb_stdout);
if ((*t != '\0') && (*t != '\n')) {
rc = (_unpackaged_files_terminate_build) ? 1 : 0;
- rpmMessage((rc ? RPMMESS_ERROR : RPMMESS_WARNING),
+ rpmlog((rc ? RPMMESS_ERROR : RPMMESS_WARNING),
_("Installed (but unpackaged) file(s) found:\n%s"), t);
}
}
@@ -2293,7 +2293,7 @@ int processBinaryFiles(rpmSpec spec, int installSpecialDoc, int test)
continue;
(void) headerNVR(pkg->header, &n, &v, &r);
- rpmMessage(RPMMESS_NORMAL, _("Processing files: %s-%s-%s\n"), n, v, r);
+ rpmlog(RPMMESS_NORMAL, _("Processing files: %s-%s-%s\n"), n, v, r);
if ((rc = processPackageFiles(spec, pkg, installSpecialDoc, test)))
res = rc;
diff --git a/build/names.c b/build/names.c
index 87c9465bc..4dd1658e6 100644
--- a/build/names.c
+++ b/build/names.c
@@ -193,7 +193,7 @@ const char * buildHost(void)
if (hbn)
strcpy(hostname, hbn->h_name);
else
- rpmMessage(RPMMESS_WARNING,
+ rpmlog(RPMMESS_WARNING,
_("Could not canonicalize hostname: %s\n"), hostname);
oneshot = 1;
}
diff --git a/build/pack.c b/build/pack.c
index ffd41b443..5f4805f2d 100644
--- a/build/pack.c
+++ b/build/pack.c
@@ -540,7 +540,7 @@ int writeRPM(Header *hdrp, unsigned char ** pkgidp, const char *fileName,
(void) rpmAddSignature(sig, sigtarget, RPMSIGTAG_MD5, passPhrase);
if ((sigtag = rpmLookupSignatureType(RPMLOOKUPSIG_QUERY)) > 0) {
- rpmMessage(RPMMESS_NORMAL, _("Generating signature: %d\n"), sigtag);
+ rpmlog(RPMMESS_NORMAL, _("Generating signature: %d\n"), sigtag);
(void) rpmAddSignature(sig, sigtarget, sigtag, passPhrase);
}
@@ -695,7 +695,7 @@ exit:
}
if (rc == 0)
- rpmMessage(RPMMESS_NORMAL, _("Wrote: %s\n"), fileName);
+ rpmlog(RPMMESS_NORMAL, _("Wrote: %s\n"), fileName);
else
(void) Unlink(fileName);
diff --git a/build/rpmfc.c b/build/rpmfc.c
index 625913f4f..996f261db 100644
--- a/build/rpmfc.c
+++ b/build/rpmfc.c
@@ -113,7 +113,7 @@ static StringBuf getOutputFrom(const char * dir, ARGV_t argv,
(void) chdir(dir);
}
- rpmMessage(RPMMESS_DEBUG, _("\texecv(%s) pid %d\n"),
+ rpmlog(RPMMESS_DEBUG, _("\texecv(%s) pid %d\n"),
argv[0], (unsigned)getpid());
unsetenv("MALLOC_CHECK_");
@@ -206,7 +206,7 @@ top:
/* Collect status from prog */
reaped = waitpid(child, &status, 0);
- rpmMessage(RPMMESS_DEBUG, _("\twaitpid(%d) rc %d status %x\n"),
+ rpmlog(RPMMESS_DEBUG, _("\twaitpid(%d) rc %d status %x\n"),
(unsigned)child, (unsigned)reaped, status);
if (failNonZero && (!WIFEXITED(status) || WEXITSTATUS(status))) {
@@ -1292,7 +1292,7 @@ assert(ftype != NULL); /* XXX figger a proper return path. */
}
se = ftype;
- rpmMessage(RPMMESS_DEBUG, "%s: %s\n", s, se);
+ rpmlog(RPMMESS_DEBUG, "%s: %s\n", s, se);
/* Save the path. */
xx = argvAdd(&fc->fn, s);
@@ -1429,15 +1429,15 @@ static void printDeps(Header h)
if (!((Flags & dm->mask) ^ dm->xor))
continue;
if (bingo == 0) {
- rpmMessage(RPMMESS_NORMAL, "%s:", (dm->msg ? dm->msg : ""));
+ rpmlog(RPMMESS_NORMAL, "%s:", (dm->msg ? dm->msg : ""));
bingo = 1;
}
if ((DNEVR = rpmdsDNEVR(ds)) == NULL)
continue; /* XXX can't happen */
- rpmMessage(RPMMESS_NORMAL, " %s", DNEVR+2);
+ rpmlog(RPMMESS_NORMAL, " %s", DNEVR+2);
}
if (bingo)
- rpmMessage(RPMMESS_NORMAL, "\n");
+ rpmlog(RPMMESS_NORMAL, "\n");
}
ds = rpmdsFree(ds);
}
@@ -1493,7 +1493,7 @@ static int rpmfcGenerateDependsHelper(const rpmSpec spec, Package pkg, rpmfi fi)
continue;
s = rpmExpand(dm->argv[0], NULL);
- rpmMessage(RPMMESS_NORMAL, _("Finding %s: %s\n"), dm->msg,
+ rpmlog(RPMMESS_NORMAL, _("Finding %s: %s\n"), dm->msg,
(s ? s : ""));
s = _free(s);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 18:47:53 +0000