RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: jbj@rpm5.org
Module: rpm Date: 30-Jul-2007 03:40:36
Branch: HEAD Handle: 2007073002403500
Modified files:
rpm/lib depends.c fsm.c manifest.c psm.c query.c rpmds.c
rpmfc.c rpmfi.c rpminstall.c rpmrollback.c rpmts.c
signature.c transaction.c
Log:
no i18n for debugging msgs.
Summary:
Revision Changes Path
1.337 +6 -6 rpm/lib/depends.c
2.126 +4 -4 rpm/lib/fsm.c
2.17 +1 -1 rpm/lib/manifest.c
2.214 +6 -6 rpm/lib/psm.c
2.176 +1 -1 rpm/lib/query.c
2.61 +1 -1 rpm/lib/rpmds.c
1.13 +2 -2 rpm/lib/rpmfc.c
2.71 +7 -7 rpm/lib/rpmfi.c
1.154 +8 -8 rpm/lib/rpminstall.c
1.8 +2 -2 rpm/lib/rpmrollback.c
2.83 +5 -5 rpm/lib/rpmts.c
2.169 +7 -7 rpm/lib/signature.c
1.328 +6 -6 rpm/lib/transaction.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/lib/depends.c
============================================================================
$ cvs diff -u -r1.336 -r1.337 depends.c
--- rpm/lib/depends.c 25 Jul 2007 16:56:08 -0000 1.336
+++ rpm/lib/depends.c 30 Jul 2007 01:40:35 -0000 1.337
@@ -431,7 +431,7 @@
xx = rpmteChain(p, q, oh, "Upgrades");
/*@-nullptrarith@*/
- rpmMessage(RPMMESS_DEBUG, _(" upgrade erases %s\n"), rpmteNEVRA(q));
+ rpmMessage(RPMMESS_DEBUG, D_(" upgrade erases %s\n"), rpmteNEVRA(q));
/*@=nullptrarith@*/
}
@@ -506,7 +506,7 @@
xx = rpmteChain(p, q, oh, "Obsoletes");
/*@-nullptrarith@*/
- rpmMessage(RPMMESS_DEBUG, _(" Obsoletes: %s\t\terases %s\n"),
+ rpmMessage(RPMMESS_DEBUG, D_(" Obsoletes: %s\t\terases %s\n"),
rpmdsDNEVR(obsoletes)+2, rpmteNEVRA(q));
/*@=nullptrarith@*/
}
@@ -1909,7 +1909,7 @@
pi = rpmtsiFree(pi);
/* Record all relations. */
- rpmMessage(RPMMESS_DEBUG, _("========== recording tsort relations\n"));
+ rpmMessage(RPMMESS_DEBUG, D_("========== recording tsort relations\n"));
pi = rpmtsiInit(ts);
while ((p = rpmtsiNext(pi, oType)) != NULL) {
@@ -2030,7 +2030,7 @@
ts->ntrees = treex;
/* T4. Scan for zeroes. */
- rpmMessage(RPMMESS_DEBUG, _("========== tsorting packages (order, #predecessors, #succesors, tree, Ldepth, Rbreadth)\n"));
+ rpmMessage(RPMMESS_DEBUG, D_("========== tsorting packages (order, #predecessors, #succesors, tree, Ldepth, Rbreadth)\n"));
rescan:
if (pi != NULL) pi = rpmtsiFree(pi);
@@ -2121,7 +2121,7 @@
_printed++;
(void) rpmtsUnorderedSuccessors(ts, orderingCount);
rpmMessage(RPMMESS_DEBUG,
- _("========== successors only (%d bytes)\n"), (int)tsbytes);
+ D_("========== successors only (%d bytes)\n"), (int)tsbytes);
/* Relink the queue in presentation order. */
tsi = rpmteTSI(q);
@@ -2225,7 +2225,7 @@
/* If a relation was eliminated, then continue sorting. */
/* XXX TODO: add control bit. */
if (nzaps && nrescans-- > 0) {
- rpmMessage(RPMMESS_DEBUG, _("========== continuing tsort ...\n"));
+ rpmMessage(RPMMESS_DEBUG, D_("========== continuing tsort ...\n"));
goto rescan;
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/fsm.c
============================================================================
$ cvs diff -u -r2.125 -r2.126 fsm.c
--- rpm/lib/fsm.c 25 Jul 2007 05:48:16 -0000 2.125
+++ rpm/lib/fsm.c 30 Jul 2007 01:40:35 -0000 2.126
@@ -355,10 +355,10 @@
if (j == 0) {
j = 1;
rpmMessage(RPMMESS_DEBUG,
- _("========== Directories not explicitly included in package:\n"));
+ D_("========== Directories not explicitly included in package:\n"));
}
(void) urlPath(fi->dnl[i], &dnl);
- rpmMessage(RPMMESS_DEBUG, _("%10d %s\n"), i, dnl);
+ rpmMessage(RPMMESS_DEBUG, "%10d %s\n", i, dnl);
}
if (j)
rpmMessage(RPMMESS_DEBUG, "==========\n");
@@ -1418,11 +1418,11 @@
}
if (fsm->fcontext == NULL)
rpmMessage(RPMMESS_DEBUG,
- _("%s directory created with perms %04o, no context.\n"),
+ D_("%s directory created with perms %04o, no context.\n"),
fsm->path, (unsigned)(st->st_mode & 07777));
else
rpmMessage(RPMMESS_DEBUG,
- _("%s directory created with perms %04o, context %s.\n"),
+ D_("%s directory created with perms %04o, context %s.\n"),
fsm->path, (unsigned)(st->st_mode & 07777),
fsm->fcontext);
fsm->fcontext = NULL;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/manifest.c
============================================================================
$ cvs diff -u -r2.16 -r2.17 manifest.c
--- rpm/lib/manifest.c 25 May 2007 17:36:02 -0000 2.16
+++ rpm/lib/manifest.c 30 Jul 2007 01:40:35 -0000 2.17
@@ -149,7 +149,7 @@
rpmrc = rpmGlob(s, &ac, &av);
if (rpmrc != RPMRC_OK) goto exit;
- rpmMessage(RPMMESS_DEBUG, _("adding %d args from manifest.\n"), ac);
+ rpmMessage(RPMMESS_DEBUG, D_("adding %d args from manifest.\n"), ac);
/* Count non-NULL args, keeping track of 1st arg after last NULL. */
npre = 0;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/psm.c
============================================================================
$ cvs diff -u -r2.213 -r2.214 psm.c
--- rpm/lib/psm.c 25 Jul 2007 17:02:34 -0000 2.213
+++ rpm/lib/psm.c 30 Jul 2007 01:40:35 -0000 2.214
@@ -444,7 +444,7 @@
(void) rpmswAdd(rpmtsOp(ts, RPMTS_OP_SCRIPTLETS), &psm->sq.op);
rpmMessage(RPMMESS_DEBUG,
- _("%s: waitpid(%d) rc %d status %x secs %u.%03u\n"),
+ D_("%s: waitpid(%d) rc %d status %x secs %u.%03u\n"),
psm->stepName, (unsigned)psm->sq.child,
(unsigned)psm->sq.reaped, psm->sq.status,
(unsigned)msecs/1000, (unsigned)msecs%1000);
@@ -636,7 +636,7 @@
if (progArgv && strcmp(progArgv[0], "<lua>") == 0) {
#ifdef WITH_LUA
rpmMessage(RPMMESS_DEBUG,
- _("%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"),
+ D_("%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"),
psm->stepName, tag2sln(psm->scriptTag), n, v, r, a);
return runLuaScript(psm, h, sln, progArgc, progArgv,
script, arg1, arg2);
@@ -653,7 +653,7 @@
if (ldconfig_path && progArgv != NULL && psm->unorderedSuccessor) {
if (ldconfig_done && !strcmp(progArgv[0], ldconfig_path)) {
rpmMessage(RPMMESS_DEBUG,
- _("%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"),
+ D_("%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"),
psm->stepName, tag2sln(psm->scriptTag), n, v, r, a,
progArgv[0]);
return rc;
@@ -661,7 +661,7 @@
}
rpmMessage(RPMMESS_DEBUG,
- _("%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"),
+ D_("%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"),
psm->stepName, tag2sln(psm->scriptTag), n, v, r, a,
(psm->unorderedSuccessor ? "a" : ""));
@@ -835,7 +835,7 @@
/*@=superuser =noeffect @*/
}
xx = Chdir("/");
- rpmMessage(RPMMESS_DEBUG, _("%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"),
+ rpmMessage(RPMMESS_DEBUG, D_("%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"),
psm->stepName, sln, n, v, r, a,
argv[0], (unsigned)getpid());
@@ -1539,7 +1539,7 @@
case PSM_UNKNOWN:
break;
case PSM_INIT:
- rpmMessage(RPMMESS_DEBUG, _("%s: %s has %d files, test = %d\n"),
+ rpmMessage(RPMMESS_DEBUG, D_("%s: %s has %d files, test = %d\n"),
psm->stepName, rpmteNEVR(psm->te),
rpmfiFC(fi), (rpmtsFlags(ts) & RPMTRANS_FLAG_TEST));
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/query.c
============================================================================
$ cvs diff -u -r2.175 -r2.176 query.c
--- rpm/lib/query.c 16 Jul 2007 01:32:28 -0000 2.175
+++ rpm/lib/query.c 30 Jul 2007 01:40:35 -0000 2.176
@@ -705,7 +705,7 @@
rpmError(RPMERR_QUERYINFO, _("invalid package number: %s\n"), arg);
return 1;
}
- rpmMessage(RPMMESS_DEBUG, _("package record number: %u\n"), recOffset);
+ rpmMessage(RPMMESS_DEBUG, D_("package record number: %u\n"), recOffset);
qva->qva_mi = rpmtsInitIterator(ts, RPMDBI_PACKAGES, &recOffset, sizeof(recOffset));
if (qva->qva_mi == NULL) {
rpmError(RPMERR_QUERYINFO,
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmds.c
============================================================================
$ cvs diff -u -r2.60 -r2.61 rpmds.c
--- rpm/lib/rpmds.c 19 Jul 2007 18:35:07 -0000 2.60
+++ rpm/lib/rpmds.c 30 Jul 2007 01:40:35 -0000 2.61
@@ -3729,7 +3729,7 @@
if (DNEVR == NULL) DNEVR = "? ?N? ?OP? ?EVR?";
/*@=branchstate@*/
- rpmMessage(RPMMESS_DEBUG, _("package %s has unsatisfied %s: %s\n"),
+ rpmMessage(RPMMESS_DEBUG, D_("package %s has unsatisfied %s: %s\n"),
pkgNEVR, ds->Type, DNEVR+2);
switch ((unsigned)DNEVR[0]) {
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmfc.c
============================================================================
$ cvs diff -u -r1.12 -r1.13 rpmfc.c
--- rpm/lib/rpmfc.c 22 Jul 2007 01:13:40 -0000 1.12
+++ rpm/lib/rpmfc.c 30 Jul 2007 01:40:35 -0000 1.13
@@ -96,7 +96,7 @@
(void) Chdir(dir);
}
- rpmMessage(RPMMESS_DEBUG, _("\texecv(%s) pid %d\n"),
+ rpmMessage(RPMMESS_DEBUG, D_("\texecv(%s) pid %d\n"),
argv[0], (unsigned)getpid());
unsetenv("MALLOC_CHECK_");
@@ -192,7 +192,7 @@
/* Collect status from prog */
reaped = waitpid(child, &status, 0);
- rpmMessage(RPMMESS_DEBUG, _("\twaitpid(%d) rc %d status %x\n"),
+ rpmMessage(RPMMESS_DEBUG, D_("\twaitpid(%d) rc %d status %x\n"),
(unsigned)child, (unsigned)reaped, status);
if (failNonZero && (!WIFEXITED(status) || WEXITSTATUS(status))) {
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmfi.c
============================================================================
$ cvs diff -u -r2.70 -r2.71 rpmfi.c
--- rpm/lib/rpmfi.c 25 Jul 2007 17:02:34 -0000 2.70
+++ rpm/lib/rpmfi.c 30 Jul 2007 01:40:35 -0000 2.71
@@ -618,7 +618,7 @@
* package has marked it as missingok, or allfiles is requested.
*/
if (skipMissing && (newFlags & RPMFILE_MISSINGOK)) {
- rpmMessage(RPMMESS_DEBUG, _("%s skipped due to missingok flag\n"),
+ rpmMessage(RPMMESS_DEBUG, D_("%s skipped due to missingok flag\n"),
fn);
return FA_SKIP;
} else {
@@ -869,14 +869,14 @@
if (!_printed) {
_printed = 1;
- rpmMessage(RPMMESS_DEBUG, _("========== relocations\n"));
+ rpmMessage(RPMMESS_DEBUG, D_("========== relocations\n"));
for (i = 0; i < numRelocations; i++) {
if (relocations[i].oldPath == NULL) continue; /* XXX can't happen */
if (relocations[i].newPath == NULL)
- rpmMessage(RPMMESS_DEBUG, _("%5d exclude %s\n"),
+ rpmMessage(RPMMESS_DEBUG, D_("%5d exclude %s\n"),
i, relocations[i].oldPath);
else
- rpmMessage(RPMMESS_DEBUG, _("%5d relocate %s -> %s\n"),
+ rpmMessage(RPMMESS_DEBUG, D_("%5d relocate %s -> %s\n"),
i, relocations[i].oldPath, relocations[i].newPath);
}
}
@@ -1010,7 +1010,7 @@
}
if (actions) {
actions[i] = FA_SKIPNSTATE;
- rpmMessage(RPMMESS_DEBUG, _("excluding %s %s\n"),
+ rpmMessage(RPMMESS_DEBUG, D_("excluding %s %s\n"),
ftstring(ft), fn);
}
continue;
@@ -1020,7 +1020,7 @@
if (fnlen != len) continue;
if (actions)
- rpmMessage(RPMMESS_DEBUG, _("relocating %s to %s\n"),
+ rpmMessage(RPMMESS_DEBUG, D_("relocating %s to %s\n"),
fn, relocations[j].newPath);
nrelocated++;
@@ -1112,7 +1112,7 @@
if (actions)
rpmMessage(RPMMESS_DEBUG,
- _("relocating directory %s to %s\n"), dirNames[i], t);
+ D_("relocating directory %s to %s\n"), dirNames[i], t);
dirNames[i] = t;
nrelocated++;
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpminstall.c
============================================================================
$ cvs diff -u -r1.153 -r1.154 rpminstall.c
--- rpm/lib/rpminstall.c 22 Jul 2007 01:12:18 -0000 1.153
+++ rpm/lib/rpminstall.c 30 Jul 2007 01:40:35 -0000 1.154
@@ -323,7 +323,7 @@
if (rpmExpandNumeric("%{?_rollback_transaction_on_failure}")) {
if (ia->arbtid) {
time_t ttid = (time_t)ia->arbtid;
- rpmMessage(RPMMESS_DEBUG, _("Autorollback Goal: %-24.24s (0x%08x)\n"),
+ rpmMessage(RPMMESS_DEBUG, D_("Autorollback Goal: %-24.24s (0x%08x)\n"),
ctime(&ttid), ia->arbtid);
rpmtsSetARBGoal(ts, ia->arbtid);
}
@@ -414,7 +414,7 @@
ts->suggests[ts->nsuggests] = _free(ts->suggests[ts->nsuggests]);
}
ts->suggests = _free(ts->suggests);
- rpmMessage(RPMMESS_DEBUG, _("Adding goal: %s\n"), fileURL);
+ rpmMessage(RPMMESS_DEBUG, D_("Adding goal: %s\n"), fileURL);
eiu->pkgURL[eiu->pkgx] = fileURL;
fileURL = NULL;
eiu->pkgx++;
@@ -447,7 +447,7 @@
/* XXX undefined %{name}/%{version}/%{release} here */
/* XXX %{_tmpdir} does not exist */
- rpmMessage(RPMMESS_DEBUG, _(" ... as %s\n"), tfn);
+ rpmMessage(RPMMESS_DEBUG, D_(" ... as %s\n"), tfn);
rc = urlGetFile(fileURL, tfn);
if (rc < 0) {
rpmMessage(RPMMESS_ERROR,
@@ -525,7 +525,7 @@
eiu->isSource = (headerIsEntry(eiu->h, RPMTAG_SOURCERPM) == 0);
if (eiu->isSource) {
- rpmMessage(RPMMESS_DEBUG, _("\tadded source package [%d]\n"),
+ rpmMessage(RPMMESS_DEBUG, D_("\tadded source package [%d]\n"),
eiu->numSRPMS);
eiu->sourceURL = xrealloc(eiu->sourceURL,
(eiu->numSRPMS + 2) * sizeof(*eiu->sourceURL));
@@ -595,7 +595,7 @@
switch(rc) {
case 0:
- rpmMessage(RPMMESS_DEBUG, _("\tadded binary package [%d]\n"),
+ rpmMessage(RPMMESS_DEBUG, D_("\tadded binary package [%d]\n"),
eiu->numRPMS);
eiu->numRPMS++;
/*@switchbreak@*/ break;
@@ -648,7 +648,7 @@
break;
}
- rpmMessage(RPMMESS_DEBUG, _("found %d source and %d binary packages\n"),
+ rpmMessage(RPMMESS_DEBUG, D_("found %d source and %d binary packages\n"),
eiu->numSRPMS, eiu->numRPMS);
if (eiu->numFailed) goto exit;
@@ -699,7 +699,7 @@
rpmcliPackagesTotal += eiu->numSRPMS;
- rpmMessage(RPMMESS_DEBUG, _("installing binary packages\n"));
+ rpmMessage(RPMMESS_DEBUG, D_("installing binary packages\n"));
/* Drop added/available package indices and dependency sets. */
rpmtsClean(ts);
@@ -791,7 +791,7 @@
if (rpmExpandNumeric("%{?_rollback_transaction_on_failure}")) {
if (ia->arbtid) {
time_t ttid = (time_t)ia->arbtid;
- rpmMessage(RPMMESS_DEBUG, _("Autorollback Goal: %-24.24s (0x%08x)\n"),
+ rpmMessage(RPMMESS_DEBUG, D_("Autorollback Goal: %-24.24s (0x%08x)\n"),
ctime(&ttid), ia->arbtid);
rpmtsSetARBGoal(ts, ia->arbtid);
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmrollback.c
============================================================================
$ cvs diff -u -r1.7 -r1.8 rpmrollback.c
--- rpm/lib/rpmrollback.c 16 Jul 2007 01:32:28 -0000 1.7
+++ rpm/lib/rpmrollback.c 30 Jul 2007 01:40:35 -0000 1.8
@@ -341,7 +341,7 @@
}
erase:
- rpmMessage(RPMMESS_DEBUG, "\t--- erase h#%u\n", ip->instance);
+ rpmMessage(RPMMESS_DEBUG, D_("\t--- erase h#%u\n"), ip->instance);
rc = rpmtsAddEraseElement(ts, ip->h, ip->instance);
if (rc != 0)
@@ -557,7 +557,7 @@
*/
while (rp != NULL && rp->val.u32 == thistid) {
if (!rp->done) {
- rpmMessage(RPMMESS_DEBUG, "\t+++ install %s\n",
+ rpmMessage(RPMMESS_DEBUG, D_("\t+++ install %s\n"),
(rp->key ? rp->key : "???"));
/*@-abstract@*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmts.c
============================================================================
$ cvs diff -u -r2.82 -r2.83 rpmts.c
--- rpm/lib/rpmts.c 25 Jul 2007 06:06:13 -0000 2.82
+++ rpm/lib/rpmts.c 30 Jul 2007 01:40:35 -0000 2.83
@@ -570,7 +570,7 @@
if (h != NULL &&
!rpmtsAddInstallElement(ts, h, (fnpyKey)str, 1, NULL))
{
- rpmMessage(RPMMESS_DEBUG, _("Adding: %s\n"), str);
+ rpmMessage(RPMMESS_DEBUG, D_("Adding: %s\n"), str);
rc = -1; /* XXX restart unsatisfiedDepends() */
break;
}
@@ -581,7 +581,7 @@
goto exit;
}
- rpmMessage(RPMMESS_DEBUG, _("Suggesting: %s\n"), str);
+ rpmMessage(RPMMESS_DEBUG, D_("Suggesting: %s\n"), str);
/* If suggestion is already present, don't bother. */
if (ts->suggests != NULL && ts->nsuggests > 0) {
if (bsearch(&str, ts->suggests, ts->nsuggests,
@@ -1146,9 +1146,9 @@
if (ts->filesystems != NULL)
return 0;
- rpmMessage(RPMMESS_DEBUG, _("mounted filesystems:\n"));
+ rpmMessage(RPMMESS_DEBUG, D_("mounted filesystems:\n"));
rpmMessage(RPMMESS_DEBUG,
- _(" i dev bsize bavail iavail mount point\n"));
+ D_(" i dev bsize bavail iavail mount point\n"));
rc = rpmGetFilesystemList(&ts->filesystems, &ts->filesystemCount);
if (rc || ts->filesystems == NULL || ts->filesystemCount <= 0)
@@ -1233,7 +1233,7 @@
#if !defined(ST_RDONLY)
#define ST_RDONLY 1
#endif
- rpmMessage(RPMMESS_DEBUG, _("%5d 0x%08x %8u %12ld %12ld %s %s\n"),
+ rpmMessage(RPMMESS_DEBUG, "%5d 0x%08x %8u %12ld %12ld %s %s\n",
i, (unsigned) dsi->dev, (unsigned) dsi->f_bsize,
(signed long) dsi->f_bavail, (signed long) dsi->f_favail,
((dsi->f_flag & ST_RDONLY) ? "ro" : "rw"),
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/signature.c
============================================================================
$ cvs diff -u -r2.168 -r2.169 signature.c
--- rpm/lib/signature.c 16 Jul 2007 01:32:28 -0000 2.168
+++ rpm/lib/signature.c 30 Jul 2007 01:40:35 -0000 2.169
@@ -136,12 +136,12 @@
expected = sizeof(struct rpmlead) + siglen + pad;
expected += datalen,
rpmMessage(RPMMESS_DEBUG,
- _("Expected size: %12lu = lead(%d)+sigs(%d)+pad(%d)+data(%lu)\n"),
+ D_("Expected size: %12lu = lead(%d)+sigs(%d)+pad(%d)+data(%lu)\n"),
(unsigned long)expected,
(int)sizeof(struct rpmlead), siglen, pad, (unsigned long)datalen);
/*@=sizeoftype@*/
rpmMessage(RPMMESS_DEBUG,
- _(" Actual size: %12lu\n"), (unsigned long)st.st_size);
+ D_(" Actual size: %12lu\n"), (unsigned long)st.st_size);
return RPMRC_OK;
}
@@ -370,7 +370,7 @@
rc = 1;
/*@=boundswrite@*/
}
- rpmMessage(RPMMESS_DEBUG, _("Signature: size(%d)+pad(%d)\n"), sigSize, pad);
+ rpmMessage(RPMMESS_DEBUG, D_("Signature: size(%d)+pad(%d)\n"), sigSize, pad);
return rc;
}
@@ -496,7 +496,7 @@
/*@-boundswrite@*/
*pktlenp = st.st_size;
- rpmMessage(RPMMESS_DEBUG, _("PGP sig size: %d\n"), *pktlenp);
+ rpmMessage(RPMMESS_DEBUG, D_("PGP sig size: %d\n"), *pktlenp);
*pktp = xmalloc(*pktlenp);
/*@=boundswrite@*/
@@ -519,7 +519,7 @@
}
}
- rpmMessage(RPMMESS_DEBUG, _("Got %d bytes of PGP sig\n"), *pktlenp);
+ rpmMessage(RPMMESS_DEBUG, D_("Got %d bytes of PGP sig\n"), *pktlenp);
/*@=boundsread@*/
#ifdef NOTYET
@@ -624,7 +624,7 @@
/*@-boundswrite@*/
*pktlenp = st.st_size;
- rpmMessage(RPMMESS_DEBUG, _("GPG sig size: %d\n"), *pktlenp);
+ rpmMessage(RPMMESS_DEBUG, D_("GPG sig size: %d\n"), *pktlenp);
*pktp = xmalloc(*pktlenp);
/*@=boundswrite@*/
@@ -647,7 +647,7 @@
}
}
- rpmMessage(RPMMESS_DEBUG, _("Got %d bytes of GPG sig\n"), *pktlenp);
+ rpmMessage(RPMMESS_DEBUG, D_("Got %d bytes of GPG sig\n"), *pktlenp);
/*@=boundsread@*/
/* Parse the signature, change signature tag as appropriate. */
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/transaction.c
============================================================================
$ cvs diff -u -r1.327 -r1.328 transaction.c
--- rpm/lib/transaction.c 16 Jul 2007 01:32:28 -0000 1.327
+++ rpm/lib/transaction.c 30 Jul 2007 01:40:35 -0000 1.328
@@ -869,7 +869,7 @@
/*@innercontinue@*/ continue;
if (strncmp(fbn, bn, bnlen))
/*@innercontinue@*/ continue;
- rpmMessage(RPMMESS_DEBUG, _("excluding directory %s\n"), dn);
+ rpmMessage(RPMMESS_DEBUG, D_("excluding directory %s\n"), dn);
fi->actions[i] = FA_SKIPNSTATE;
/*@innerbreak@*/ break;
}
@@ -1230,7 +1230,7 @@
* - count files.
*/
-rpmMessage(RPMMESS_DEBUG, _("sanity checking %d elements\n"), rpmtsNElements(ts));
+rpmMessage(RPMMESS_DEBUG, D_("sanity checking %d elements\n"), rpmtsNElements(ts));
ps = rpmtsProblems(ts);
/* The ordering doesn't matter here */
pi = rpmtsiInit(ts);
@@ -1303,7 +1303,7 @@
|| (rpmpsNumProblems(ts->probs) &&
(okProbs == NULL || rpmpsTrim(ts->probs, okProbs)))))
{
- rpmMessage(RPMMESS_DEBUG, _("running pre-transaction scripts\n"));
+ rpmMessage(RPMMESS_DEBUG, D_("running pre-transaction scripts\n"));
pi = rpmtsiInit(ts);
while ((p = rpmtsiNext(pi, TR_ADDED)) != NULL) {
if ((fi = rpmtsiFi(pi)) == NULL)
@@ -1378,7 +1378,7 @@
* calling fpLookupList only once. I'm not sure that the speedup is
* worth the trouble though.
*/
-rpmMessage(RPMMESS_DEBUG, _("computing %d file fingerprints\n"), totalFileCount);
+rpmMessage(RPMMESS_DEBUG, D_("computing %d file fingerprints\n"), totalFileCount);
numAdded = numRemoved = 0;
pi = rpmtsiInit(ts);
@@ -1467,7 +1467,7 @@
/* ===============================================
* Compute file disposition for each package in transaction set.
*/
-rpmMessage(RPMMESS_DEBUG, _("computing file dispositions\n"));
+rpmMessage(RPMMESS_DEBUG, D_("computing file dispositions\n"));
ps = rpmtsProblems(ts);
pi = rpmtsiInit(ts);
/*@-nullpass@*/
@@ -1880,7 +1880,7 @@
pi = rpmtsiFree(pi);
if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_TEST)) {
- rpmMessage(RPMMESS_DEBUG, _("running post-transaction scripts\n"));
+ rpmMessage(RPMMESS_DEBUG, D_("running post-transaction scripts\n"));
pi = rpmtsiInit(ts);
while ((p = rpmtsiNext(pi, TR_ADDED)) != NULL) {
int haspostscript;
@@ .
Received on Mon Jul 30 03:40:36 2007