Replace all uses of RPMMESS_NORMAL with RPMLOG_NOTICE

diff --git a/build/build.c b/build/build.c
index 01312a4..235be0b 100644 (file)
--- 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);
 
-    rpmlog(RPMMESS_NORMAL, _("Executing(%s): %s\n"), name, buildCmd);
+    rpmlog(RPMLOG_NOTICE, _("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) {
-       rpmlog(RPMMESS_NORMAL, _("\n\nRPM build errors:\n"));
+       rpmlog(RPMLOG_NOTICE, _("\n\nRPM build errors:\n"));
        rpmlogPrint(NULL);
     }
 

diff --git a/build/files.c b/build/files.c
index 81d8565..9faeb62 100644 (file)
--- a/build/files.c
+++ b/build/files.c
@@ -2253,7 +2253,7 @@ static int checkFiles(StringBuf fileList)
     }
     rc = 0;
 
-    rpmlog(RPMMESS_NORMAL, _("Checking for unpackaged file(s): %s\n"), s);
+    rpmlog(RPMLOG_NOTICE, _("Checking for unpackaged file(s): %s\n"), s);
 
     rc = rpmfcExec(av_ckfile, fileList, &sb_stdout, 0);
     if (rc < 0)
@@ -2293,7 +2293,7 @@ int processBinaryFiles(rpmSpec spec, int installSpecialDoc, int test)
            continue;
 
        (void) headerNVR(pkg->header, &n, &v, &r);
-       rpmlog(RPMMESS_NORMAL, _("Processing files: %s-%s-%s\n"), n, v, r);
+       rpmlog(RPMLOG_NOTICE, _("Processing files: %s-%s-%s\n"), n, v, r);
                   
        if ((rc = processPackageFiles(spec, pkg, installSpecialDoc, test)))
            res = rc;

diff --git a/build/pack.c b/build/pack.c
index 5f4805f..5af1faa 100644 (file)
--- 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) {
-       rpmlog(RPMMESS_NORMAL, _("Generating signature: %d\n"), sigtag);
+       rpmlog(RPMLOG_NOTICE, _("Generating signature: %d\n"), sigtag);
        (void) rpmAddSignature(sig, sigtarget, sigtag, passPhrase);
     }
     
@@ -695,7 +695,7 @@ exit:
     }
 
     if (rc == 0)
-       rpmlog(RPMMESS_NORMAL, _("Wrote: %s\n"), fileName);
+       rpmlog(RPMLOG_NOTICE, _("Wrote: %s\n"), fileName);
     else
        (void) Unlink(fileName);
 

diff --git a/build/rpmfc.c b/build/rpmfc.c
index 2f69e6b..f46deae 100644 (file)
--- a/build/rpmfc.c
+++ b/build/rpmfc.c
@@ -1429,15 +1429,15 @@ static void printDeps(Header h)
            if (!((Flags & dm->mask) ^ dm->xor))
                continue;
            if (bingo == 0) {
-               rpmlog(RPMMESS_NORMAL, "%s:", (dm->msg ? dm->msg : ""));
+               rpmlog(RPMLOG_NOTICE, "%s:", (dm->msg ? dm->msg : ""));
                bingo = 1;
            }
            if ((DNEVR = rpmdsDNEVR(ds)) == NULL)
                continue;       /* XXX can't happen */
-           rpmlog(RPMMESS_NORMAL, " %s", DNEVR+2);
+           rpmlog(RPMLOG_NOTICE, " %s", DNEVR+2);
        }
        if (bingo)
-           rpmlog(RPMMESS_NORMAL, "\n");
+           rpmlog(RPMLOG_NOTICE, "\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);
-       rpmlog(RPMMESS_NORMAL, _("Finding  %s: %s\n"), dm->msg,
+       rpmlog(RPMLOG_NOTICE, _("Finding  %s: %s\n"), dm->msg,
                (s ? s : ""));
        s = _free(s);
 

diff --git a/lib/poptALL.c b/lib/poptALL.c
index 444c313..855932c 100644 (file)
--- a/lib/poptALL.c
+++ b/lib/poptALL.c
@@ -337,7 +337,7 @@ rpmcliInit(int argc, char *const argv[], struct poptOption * optionsTable)
     (void) textdomain(PACKAGE);
 #endif
 
-    rpmSetVerbosity(RPMMESS_NORMAL);
+    rpmSetVerbosity(RPMLOG_NOTICE);
 
     if (optionsTable == NULL) {
        /* Read rpm configuration (if not already read). */

diff --git a/lib/query.c b/lib/query.c
index d2fc8a8..d877b62 100644 (file)
--- a/lib/query.c
+++ b/lib/query.c
@@ -128,7 +128,7 @@ static void flushBuffer(char ** tp, char ** tep, int nonewline)
            *te++ = '\n';
            *te = '\0';
        }
-       rpmlog(RPMMESS_NORMAL, "%s", t);
+       rpmlog(RPMLOG_NOTICE, "%s", t);
        te = t;
        *t = '\0';
     }

diff --git a/lib/rpminstall.c b/lib/rpminstall.c
index 781c8af..3212239 100644 (file)
--- a/lib/rpminstall.c
+++ b/lib/rpminstall.c
@@ -600,14 +600,14 @@ maybe_manifest:
            stopInstall = 1;
 
            if (ts->suggests != NULL && ts->nsuggests > 0) {
-               rpmlog(RPMMESS_NORMAL, _("    Suggested resolutions:\n"));
+               rpmlog(RPMLOG_NOTICE, _("    Suggested resolutions:\n"));
                for (i = 0; i < ts->nsuggests; i++) {
                    const char * str = ts->suggests[i];
 
                    if (str == NULL)
                        break;
 
-                   rpmlog(RPMMESS_NORMAL, "\t%s\n", str);
+                   rpmlog(RPMLOG_NOTICE, "\t%s\n", str);
                
                    ts->suggests[i] = NULL;
                    str = _free(str);
@@ -1005,7 +1005,7 @@ int rpmRollback(rpmts ts, struct rpmInstallArguments_s * ia, const char ** argv)
            break;
 
        tid = (time_t)thistid;
-       rpmlog(RPMMESS_NORMAL,
+       rpmlog(RPMLOG_NOTICE,
                _("Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"),
                        numAdded, numRemoved, ctime(&tid), tid);
 
@@ -1037,14 +1037,14 @@ int rpmRollback(rpmts ts, struct rpmInstallArguments_s * ia, const char ** argv)
        /* Clean up after successful rollback. */
        if (rtids && !rpmIsDebug()) {
            int i;
-           rpmlog(RPMMESS_NORMAL, _("Cleaning up repackaged packages:\n"));
+           rpmlog(RPMLOG_NOTICE, _("Cleaning up repackaged packages:\n"));
            if (rtids->idt)
            for (i = 0; i < rtids->nidt; i++) {
                IDT rrp = rtids->idt + i;
                if (rrp->val.u32 != thistid)
                    continue;
                if (rrp->key) { /* XXX can't happen */
-                   rpmlog(RPMMESS_NORMAL, _("\tRemoving %s:\n"), rrp->key);
+                   rpmlog(RPMLOG_NOTICE, _("\tRemoving %s:\n"), rrp->key);
                    (void) unlink(rrp->key);    /* XXX: Should check rc??? */
                }
            }

diff --git a/lib/transaction.c b/lib/transaction.c
index 7d976ea..02d2ea5 100644 (file)
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -935,8 +935,8 @@ static rpmRC _rpmtsRollback(rpmts rollbackTransaction)
     }
     tsi = rpmtsiFree(tsi);
 
-    rpmlog(RPMMESS_NORMAL, _("Transaction failed...rolling back\n"));
-    rpmlog(RPMMESS_NORMAL,
+    rpmlog(RPMLOG_NOTICE, _("Transaction failed...rolling back\n"));
+    rpmlog(RPMLOG_NOTICE,
        _("Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"),
                         numAdded, numRemoved, ctime((time_t*) &tid), tid);
 
@@ -988,13 +988,13 @@ static rpmRC _rpmtsRollback(rpmts rollbackTransaction)
      */
     tsi = rpmtsiInit(rollbackTransaction);
     while((te = rpmtsiNext(tsi, 0)) != NULL) {
-       rpmlog(RPMMESS_NORMAL, _("Cleaning up repackaged packages:\n"));
+       rpmlog(RPMLOG_NOTICE, _("Cleaning up repackaged packages:\n"));
        switch (rpmteType(te)) {
        /* The install elements are repackaged packages */
        case TR_ADDED:
            /* Make sure the filename is still there.  XXX: Can't happen */
            if(te->key) {
-               rpmlog(RPMMESS_NORMAL, _("\tRemoving %s:\n"), te->key);
+               rpmlog(RPMLOG_NOTICE, _("\tRemoving %s:\n"), te->key);
                (void) unlink(te->key); /* XXX: Should check for an error? */
            }
            break;

diff --git a/lib/trb.c b/lib/trb.c
index 376f374..59a38fd 100644 (file)
--- a/lib/trb.c
+++ b/lib/trb.c
@@ -39,7 +39,7 @@ main(int argc, char *argv[])
     textdomain(PACKAGE);
 #endif
 
-    rpmSetVerbosity(RPMMESS_NORMAL);
+    rpmSetVerbosity(RPMLOG_NOTICE);
 
     optCon = poptGetContext(argv[0], argc, argv, optionsTable, 0);
     (void) poptReadConfigFile(optCon, LIBRPMALIAS_FILENAME);

diff --git a/lib/verify.c b/lib/verify.c
index 99ead01..fc220bd 100644 (file)
--- a/lib/verify.c
+++ b/lib/verify.c
@@ -332,7 +332,7 @@ static int verifyHeader(QVA_t qva, const rpmts ts, rpmfi fi)
        if (te > t) {
            *te++ = '\n';
            *te = '\0';
-           rpmlog(RPMMESS_NORMAL, "%s", t);
+           rpmlog(RPMLOG_NOTICE, "%s", t);
            te = t = buf;
            *t = '\0';
        }
@@ -392,7 +392,7 @@ static int verifyDependencies(QVA_t qva, rpmts ts,
        if (te > t) {
            *te++ = '\n';
            *te = '\0';
-           rpmlog(RPMMESS_NORMAL, "%s", t);
+           rpmlog(RPMLOG_NOTICE, "%s", t);
            te = t;
            *t = '\0';
        }

diff --git a/rpmdb/rpmdb.c b/rpmdb/rpmdb.c
index 98feb3b..baeaa5e 100644 (file)
--- a/rpmdb/rpmdb.c
+++ b/rpmdb/rpmdb.c
@@ -3587,7 +3587,7 @@ int rpmdbRebuild(const char * prefix, rpmts ts,
     xx = rpmdbClose(newdb);
 
     if (failed) {
-       rpmlog(RPMMESS_NORMAL, _("failed to rebuild database: original database "
+       rpmlog(RPMLOG_NOTICE, _("failed to rebuild database: original database "
                "remains in place\n"));
 
        xx = rpmdbRemoveDatabase(prefix, newdbpath, _dbapi_rebuild);

diff --git a/rpmqv.c b/rpmqv.c
index 29b56e7..f10f706 100644 (file)
--- a/rpmqv.c
+++ b/rpmqv.c
@@ -265,7 +265,7 @@ int main(int argc, char *argv[])
     textdomain(PACKAGE);
 #endif
 
-    rpmSetVerbosity(RPMMESS_NORMAL);   /* XXX silly use by showrc */
+    rpmSetVerbosity(RPMLOG_NOTICE);    /* XXX silly use by showrc */
 
     /* Make a first pass through the arguments, looking for --rcfile */
     /* We need to handle that before dealing with the rest of the arguments. */

diff --git a/tools/rpmgraph.c b/tools/rpmgraph.c
index 6f28c63..f07be71 100644 (file)
--- a/tools/rpmgraph.c
+++ b/tools/rpmgraph.c
@@ -196,14 +196,14 @@ maybe_manifest:
            numFailed += numPkgs;
 
            if (ts->suggests != NULL && ts->nsuggests > 0) {
-               rpmlog(RPMMESS_NORMAL, _("    Suggested resolutions:\n"));
+               rpmlog(RPMLOG_NOTICE, _("    Suggested resolutions:\n"));
                for (i = 0; i < ts->nsuggests; i++) {
                    const char * str = ts->suggests[i];
 
                    if (str == NULL)
                        break;
 
-                   rpmlog(RPMMESS_NORMAL, "\t%s\n", str);
+                   rpmlog(RPMLOG_NOTICE, "\t%s\n", str);
                    ts->suggests[i] = NULL;
                    str = _free(str);
                }