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: 11-Oct-2007 21:14:41
Branch: HEAD Handle: 2007101120143605
Modified files:
rpm CHANGES build.c
rpm/build build.c files.c pack.c parseSpec.c spec.c
rpm/lib fs.c fsm.c package.c psm.c query.c rpmchecksig.c
rpmfc.c rpmgi.c rpminstall.c rpmrollback.c rpmts.c
rpm/rpmdb rpmdb.c signature.c
rpm/rpmio mire.c rpmlua.c
Log:
- finish eliminating rpmError.
Summary:
Revision Changes Path
1.1668 +1 -0 rpm/CHANGES
2.110 +6 -6 rpm/build.c
2.117 +4 -4 rpm/build/build.c
1.264 +2 -2 rpm/build/files.c
2.231 +19 -19 rpm/build/pack.c
2.104 +9 -9 rpm/build/parseSpec.c
2.156 +2 -2 rpm/build/spec.c
2.57 +6 -6 rpm/lib/fs.c
2.131 +6 -6 rpm/lib/fsm.c
2.168 +3 -3 rpm/lib/package.c
2.235 +8 -8 rpm/lib/psm.c
2.186 +21 -23 rpm/lib/query.c
1.151 +16 -17 rpm/lib/rpmchecksig.c
1.20 +3 -3 rpm/lib/rpmfc.c
2.35 +2 -2 rpm/lib/rpmgi.c
1.167 +1 -1 rpm/lib/rpminstall.c
1.15 +1 -1 rpm/lib/rpmrollback.c
2.106 +5 -5 rpm/lib/rpmts.c
1.172 +6 -6 rpm/rpmdb/rpmdb.c
1.5 +11 -11 rpm/rpmdb/signature.c
1.7 +2 -2 rpm/rpmio/mire.c
2.23 +6 -6 rpm/rpmio/rpmlua.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1667 -r1.1668 CHANGES
--- rpm/CHANGES 11 Oct 2007 16:23:05 -0000 1.1667
+++ rpm/CHANGES 11 Oct 2007 19:14:36 -0000 1.1668
@@ -1,4 +1,5 @@
4.5 -> 5.0:
+ - jbj: finish eliminating rpmError.
- jbj: switch rpmdbRemove to use headerGetExtension.
- jbj: switch rpmdbAdd to use headerGetExtension. ~1Mb leaks w --rebuilddb.
- jbj: fix: headerGetExtension failed to return p.str correctly.
@@ .
patch -p0 <<'@@ .'
Index: rpm/build.c
============================================================================
$ cvs diff -u -r2.109 -r2.110 build.c
--- rpm/build.c 22 Sep 2007 21:12:56 -0000 2.109
+++ rpm/build.c 11 Oct 2007 19:14:36 -0000 2.110
@@ -69,7 +69,7 @@
fd = Fopen(specfile, "r");
if (fd == NULL || Ferror(fd)) {
- rpmError(RPMERR_OPEN, _("Unable to open spec file %s: %s\n"),
+ rpmlog(RPMLOG_ERR, _("Unable to open spec file %s: %s\n"),
specfile, Fstrerror(fd));
return 0;
}
@@ -146,7 +146,7 @@
break;
}
if (!bingo) {
- rpmError(RPMERR_READ, _("Failed to read spec file from %s\n"), arg);
+ rpmlog(RPMLOG_ERR, _("Failed to read spec file from %s\n"), arg);
xx = Unlink(tmpSpecFile);
tmpSpecFile = _free(tmpSpecFile);
return 1;
@@ -160,7 +160,7 @@
specut = urlPath(specURL, &specFile);
xx = Rename(tmpSpecFile, specFile);
if (xx) {
- rpmError(RPMERR_RENAME, _("Failed to rename %s to %s: %m\n"),
+ rpmlog(RPMLOG_ERR, _("Failed to rename %s to %s: %m\n"),
tmpSpecFile, s);
(void) Unlink(tmpSpecFile);
}
@@ -201,12 +201,12 @@
if (specut != URL_IS_DASH) {
struct stat sb;
if (Stat(specURL, &sb) < 0) {
- rpmError(RPMERR_STAT, _("failed to stat %s: %m\n"), specURL);
+ rpmlog(RPMLOG_ERR, _("failed to stat %s: %m\n"), specURL);
rc = 1;
goto exit;
}
if (! S_ISREG(sb.st_mode)) {
- rpmError(RPMERR_NOTREG, _("File %s is not a regular file.\n"),
+ rpmlog(RPMLOG_ERR, _("File %s is not a regular file.\n"),
specURL);
rc = 1;
goto exit;
@@ -214,7 +214,7 @@
/* Try to verify that the file is actually a specfile */
if (!isSpecFile(specURL)) {
- rpmError(RPMERR_BADSPEC,
+ rpmlog(RPMLOG_ERR,
_("File %s does not appear to be a specfile.\n"), specURL);
rc = 1;
goto exit;
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/build.c
============================================================================
$ cvs diff -u -r2.116 -r2.117 build.c
--- rpm/build/build.c 30 Sep 2007 22:38:28 -0000 2.116
+++ rpm/build/build.c 11 Oct 2007 19:14:36 -0000 2.117
@@ -147,7 +147,7 @@
}
if (rpmTempFile(rootURL, &scriptName, &fd) || fd == NULL || Ferror(fd)) {
- rpmError(RPMERR_SCRIPT, _("Unable to open temp file.\n"));
+ rpmlog(RPMLOG_ERR, _("Unable to open temp file.\n"));
rc = RPMERR_SCRIPT;
goto exit;
}
@@ -239,7 +239,7 @@
(void) execvp(argv[0], (char *const *)argv);
/*@=boundsread@*/
- rpmError(RPMERR_SCRIPT, _("Exec of %s failed (%s): %s\n"),
+ rpmlog(RPMLOG_ERR, _("Exec of %s failed (%s): %s\n"),
scriptName, name, strerror(errno));
_exit(-1);
@@ -248,9 +248,9 @@
rc = waitpid(child, &status, 0);
if (!WIFEXITED(status) || WEXITSTATUS(status)) {
- rpmError(RPMERR_SCRIPT, _("Bad exit status from %s (%s)\n"),
+ rpmlog(RPMLOG_ERR, _("Bad exit status from %s (%s)\n"),
scriptName, name);
- rc = RPMERR_SCRIPT;
+ rc = RPMRC_FAIL;
} else
rc = 0;
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/files.c
============================================================================
$ cvs diff -u -r1.263 -r1.264 files.c
--- rpm/build/files.c 11 Oct 2007 13:04:26 -0000 1.263
+++ rpm/build/files.c 11 Oct 2007 19:14:36 -0000 1.264
@@ -924,7 +924,7 @@
if (!strcmp(s, "%docdir")) {
s = strtokWithQuotes(NULL, " \t\n");
if (fl->docDirCount == MAXDOCDIR) {
- rpmError(RPMERR_INTERNAL, _("Hit limit for %%docdir\n"));
+ rpmlog(RPMLOG_CRIT, _("Hit limit for %%docdir\n"));
fl->processingFailed = 1;
res = 1;
}
@@ -932,7 +932,7 @@
if (s != NULL)
fl->docDirs[fl->docDirCount++] = xstrdup(s);
if (s == NULL || strtokWithQuotes(NULL, " \t\n")) {
- rpmError(RPMERR_INTERNAL, _("Only one arg for %%docdir\n"));
+ rpmlog(RPMLOG_CRIT, _("Only one arg for %%docdir\n"));
fl->processingFailed = 1;
res = 1;
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/pack.c
============================================================================
$ cvs diff -u -r2.230 -r2.231 pack.c
--- rpm/build/pack.c 11 Oct 2007 13:04:26 -0000 2.230
+++ rpm/build/pack.c 11 Oct 2007 19:14:36 -0000 2.231
@@ -607,8 +607,8 @@
/* Reallocate the header into one contiguous region. */
h = headerReload(h, RPMTAG_HEADERIMMUTABLE);
if (h == NULL) { /* XXX can't happen */
- rc = RPMERR_RELOAD;
- rpmError(RPMERR_RELOAD, _("Unable to create immutable header region.\n"));
+ rpmlog(RPMLOG_ERR, _("Unable to create immutable header region.\n"));
+ rc = RPMRC_FAIL;
goto exit;
}
/* Re-reference reallocated header. */
@@ -620,15 +620,15 @@
*/
sigtarget = NULL;
if (rpmTempFile(NULL, &sigtarget, &fd)) {
- rc = RPMRC_FAIL;
rpmlog(RPMLOG_ERR, _("Unable to open temp file.\n"));
+ rc = RPMRC_FAIL;
goto exit;
}
fdInitDigest(fd, PGPHASHALGO_SHA1, 0);
if (headerWrite(fd, h)) {
- rc = RPMERR_NOSPACE;
- rpmError(RPMERR_NOSPACE, _("Unable to write temp header\n"));
+ rc = RPMRC_FAIL;
+ rpmlog(RPMLOG_ERR, _("Unable to write temp header\n"));
} else { /* Write the archive and get the size */
(void) Fflush(fd);
fdFiniDigest(fd, PGPHASHALGO_SHA1, &SHA1, NULL, 1);
@@ -685,17 +685,17 @@
/* Reallocate the signature into one contiguous region. */
sigh = headerReload(sigh, RPMTAG_HEADERSIGNATURES);
if (sigh == NULL) { /* XXX can't happen */
- rc = RPMERR_RELOAD;
- rpmError(RPMERR_RELOAD, _("Unable to reload signature header.\n"));
+ rpmlog(RPMLOG_ERR, _("Unable to reload signature header.\n"));
+ rc = RPMRC_FAIL;
goto exit;
}
/* Open the output file */
fd = Fopen(fileName, "w.fdio");
if (fd == NULL || Ferror(fd)) {
- rc = RPMRC_FAIL;
rpmlog(RPMLOG_ERR, _("Could not open %s: %s\n"),
fileName, Fstrerror(fd));
+ rc = RPMRC_FAIL;
goto exit;
}
@@ -717,8 +717,8 @@
}
if (_rc != RPMRC_OK) {
- rc = RPMERR_NOSPACE;
- rpmError(RPMERR_NOSPACE, _("Unable to write package: %s\n"),
+ rc = RPMRC_FAIL;
+ rpmlog(RPMLOG_ERR, _("Unable to write package: %s\n"),
Fstrerror(fd));
goto exit;
}
@@ -731,7 +731,7 @@
_rc = rpmpkgWrite(item, fd, sigh, NULL);
if (_rc != RPMRC_OK) {
- rc = RPMERR_NOSPACE;
+ rc = RPMRC_FAIL;
goto exit;
}
}
@@ -740,7 +740,7 @@
ifd = Fopen(sigtarget, "r.fdio");
if (ifd == NULL || Ferror(ifd)) {
rc = RPMERR_READ;
- rpmError(RPMERR_READ, _("Unable to open sigtarget %s: %s\n"),
+ rpmlog(RPMLOG_ERR, _("Unable to open sigtarget %s: %s\n"),
sigtarget, Fstrerror(ifd));
goto exit;
}
@@ -751,7 +751,7 @@
if (nh == NULL) {
rc = RPMERR_READ;
- rpmError(RPMERR_READ, _("Unable to read header from %s: %s\n"),
+ rpmlog(RPMLOG_ERR, _("Unable to read header from %s: %s\n"),
sigtarget, Fstrerror(ifd));
goto exit;
}
@@ -764,8 +764,8 @@
nh = headerFree(nh);
if (rc) {
- rc = RPMERR_NOSPACE;
- rpmError(RPMERR_NOSPACE, _("Unable to write header to %s: %s\n"),
+ rc = RPMRC_FAIL;
+ rpmlog(RPMLOG_ERR, _("Unable to write header to %s: %s\n"),
fileName, Fstrerror(fd));
goto exit;
}
@@ -774,15 +774,15 @@
/* Write the payload into the package. */
while ((count = Fread(buf, sizeof(buf[0]), sizeof(buf), ifd)) > 0) {
if (count == -1) {
- rc = RPMERR_READ;
- rpmError(RPMERR_READ, _("Unable to read payload from %s: %s\n"),
+ rpmlog(RPMLOG_ERR, _("Unable to read payload from %s: %s\n"),
sigtarget, Fstrerror(ifd));
+ rc = RPMRC_FAIL;
goto exit;
}
if (Fwrite(buf, sizeof(buf[0]), count, fd) != count) {
- rc = RPMERR_NOSPACE;
- rpmError(RPMERR_NOSPACE, _("Unable to write payload to %s: %s\n"),
+ rpmlog(RPMLOG_ERR, _("Unable to write payload to %s: %s\n"),
fileName, Fstrerror(fd));
+ rc = RPMRC_FAIL;
goto exit;
}
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/parseSpec.c
============================================================================
$ cvs diff -u -r2.103 -r2.104 parseSpec.c
--- rpm/build/parseSpec.c 11 Oct 2007 13:04:26 -0000 2.103
+++ rpm/build/parseSpec.c 11 Oct 2007 19:14:36 -0000 2.104
@@ -190,7 +190,7 @@
/*@-observertrans -readonlytrans@*/
spec->nextline = "";
/*@=observertrans =readonlytrans@*/
- return RPMERR_UNMATCHEDIF;
+ return RPMRC_FAIL;
}
/*@-mods@*/
spec->lbufPtr = spec->lbuf;
@@ -267,8 +267,8 @@
if (f == NULL || !fgets(ofi->readBuf, BUFSIZ, f)) {
/* EOF */
if (spec->readStack->next) {
- rpmError(RPMERR_UNMATCHEDIF, _("Unclosed %%if\n"));
- return RPMERR_UNMATCHEDIF;
+ rpmlog(RPMLOG_ERR, _("Unclosed %%if\n"));
+ return RPMRC_FAIL;
}
/* remove this file from the stack */
@@ -301,7 +301,7 @@
/* Copy next file line into the spec line buffer */
if ((rc = copyNextLine(spec, ofi, strip)) != 0) {
- if (rc == RPMERR_UNMATCHEDIF)
+ if (rc == RPMRC_FAIL)
goto retry;
return rc;
}
@@ -336,7 +336,7 @@
s += 3;
match = parseExpressionBoolean(spec, s);
if (match < 0) {
- rpmError(RPMERR_UNMATCHEDIF,
+ rpmlog(RPMLOG_ERR,
_("%s:%d: parseExpressionBoolean returns %d\n"),
ofi->fileName, ofi->lineNum, match);
return RPMRC_FAIL;
@@ -345,10 +345,10 @@
s += 5;
if (! spec->readStack->next) {
/* Got an else with no %if ! */
- rpmError(RPMERR_UNMATCHEDIF,
+ rpmlog(RPMLOG_ERR,
_("%s:%d: Got a %%else with no %%if\n"),
ofi->fileName, ofi->lineNum);
- return RPMERR_UNMATCHEDIF;
+ return RPMRC_FAIL;
}
spec->readStack->reading =
spec->readStack->next->reading && ! spec->readStack->reading;
@@ -357,10 +357,10 @@
s += 6;
if (! spec->readStack->next) {
/* Got an end with no %if ! */
- rpmError(RPMERR_UNMATCHEDIF,
+ rpmlog(RPMLOG_ERR,
_("%s:%d: Got a %%endif with no %%if\n"),
ofi->fileName, ofi->lineNum);
- return RPMERR_UNMATCHEDIF;
+ return RPMRC_FAIL;
}
rl = spec->readStack;
spec->readStack = spec->readStack->next;
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/spec.c
============================================================================
$ cvs diff -u -r2.155 -r2.156 spec.c
--- rpm/build/spec.c 11 Oct 2007 13:04:26 -0000 2.155
+++ rpm/build/spec.c 11 Oct 2007 19:14:36 -0000 2.156
@@ -682,7 +682,7 @@
/* XXX this should use queryHeader(), but prints out tn as well. */
msgstr = headerSprintf(h, fmt, rpmTagTable, rpmHeaderFormats, &errstr);
if (msgstr == NULL) {
- rpmError(RPMERR_QFMT, _("can't query %s: %s\n"), tn, errstr);
+ rpmlog(RPMLOG_ERR, _("can't query %s: %s\n"), tn, errstr);
return;
}
@@ -764,7 +764,7 @@
cookie, anyarch, 1, verify)
|| (spec = rpmtsSetSpec(ts, NULL)) == NULL)
{
- rpmError(RPMERR_QUERY,
+ rpmlog(RPMLOG_ERR,
_("query of specfile %s failed, can't parse\n"),
specName);
goto exit;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/fs.c
============================================================================
$ cvs diff -u -r2.56 -r2.57 fs.c
--- rpm/lib/fs.c 11 Oct 2007 13:04:27 -0000 2.56
+++ rpm/lib/fs.c 11 Oct 2007 19:14:37 -0000 2.57
@@ -76,7 +76,7 @@
num = mntctl(MCTL_QUERY, sizeof(size), (char *) &size);
if (num < 0) {
- rpmError(RPMERR_MTAB, _("mntctl() failed to return size: %s\n"),
+ rpmlog(RPMLOG_ERR, _("mntctl() failed to return size: %s\n"),
strerror(errno));
return 1;
}
@@ -91,7 +91,7 @@
buf = alloca(size);
num = mntctl(MCTL_QUERY, size, buf);
if ( num <= 0 ) {
- rpmError(RPMERR_MTAB, _("mntctl() failed to return mount points: %s\n"),
+ rpmlog(RPMLOG_ERR, _("mntctl() failed to return mount points: %s\n"),
strerror(errno));
return 1;
}
@@ -111,7 +111,7 @@
filesystems[i].mntPoint = fsnames[i] = fsn;
if (stat(filesystems[i].mntPoint, &sb)) {
- rpmError(RPMERR_STAT, _("failed to stat %s: %s\n"), fsnames[i],
+ rpmlog(RPMLOG_ERR, _("failed to stat %s: %s\n"), fsnames[i],
strerror(errno));
rpmFreeFilesystems();
@@ -156,7 +156,7 @@
mtab = fopen(MOUNTED, "r");
if (!mtab) {
- rpmError(RPMERR_MTAB, _("failed to open %s: %s\n"), MOUNTED,
+ rpmlog(RPMLOG_ERR, _("failed to open %s: %s\n"), MOUNTED,
strerror(errno));
return 1;
}
@@ -216,7 +216,7 @@
if (stat(mntdir, &sb)) {
switch(errno) {
default:
- rpmError(RPMERR_STAT, _("failed to stat %s: %s\n"), mntdir,
+ rpmlog(RPMLOG_ERR, _("failed to stat %s: %s\n"), mntdir,
strerror(errno));
rpmFreeFilesystems();
return 1;
@@ -333,7 +333,7 @@
chptr = dirName + strlen(dirName) - 1;
while (stat(dirName, &sb)) {
if (errno != ENOENT) {
- rpmError(RPMERR_STAT, _("failed to stat %s: %s\n"), buf,
+ rpmlog(RPMLOG_ERR, _("failed to stat %s: %s\n"), buf,
strerror(errno));
sourceDir = _free(sourceDir);
usages = _free(usages);
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/fsm.c
============================================================================
$ cvs diff -u -r2.130 -r2.131 fsm.c
--- rpm/lib/fsm.c 30 Sep 2007 20:38:25 -0000 2.130
+++ rpm/lib/fsm.c 11 Oct 2007 19:14:37 -0000 2.131
@@ -1956,14 +1956,14 @@
/*@innerbreak@*/ break;
/* XXX common error message. */
- rpmError(
- (strict_erasures ? RPMERR_RMDIR : RPMDEBUG_RMDIR),
+ rpmlog(
+ (strict_erasures ? RPMLOG_ERR : RPMLOG_DEBUG),
_("%s rmdir of %s failed: Directory not empty\n"),
rpmfiTypeString(fi), fsm->path);
/*@innerbreak@*/ break;
default:
- rpmError(
- (strict_erasures ? RPMERR_RMDIR : RPMDEBUG_RMDIR),
+ rpmlog(
+ (strict_erasures ? RPMLOG_ERR : RPMLOG_DEBUG),
_("%s rmdir of %s failed: %s\n"),
rpmfiTypeString(fi), fsm->path, strerror(errno));
/*@innerbreak@*/ break;
@@ -1977,8 +1977,8 @@
/*@innerbreak@*/ break;
/*@fallthrough@*/
default:
- rpmError(
- (strict_erasures ? RPMERR_UNLINK : RPMDEBUG_UNLINK),
+ rpmlog(
+ (strict_erasures ? RPMLOG_ERR : RPMLOG_DEBUG),
_(" %s: unlink of %s failed: %s\n"),
rpmfiTypeString(fi), fsm->path, strerror(errno));
/*@innerbreak@*/ break;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/package.c
============================================================================
$ cvs diff -u -r2.167 -r2.168 package.c
--- rpm/lib/package.c 11 Oct 2007 13:04:27 -0000 2.167
+++ rpm/lib/package.c 11 Oct 2007 19:14:37 -0000 2.168
@@ -227,7 +227,7 @@
rc = rpmpkgRead(item, fd, NULL, &msg);
switch (rc) {
default:
- rpmError(RPMERR_READLEAD, "%s: %s: %s\n", fn, item, msg);
+ rpmlog(RPMLOG_ERR, "%s: %s: %s\n", fn, item, msg);
/*@fallthrough@*/
case RPMRC_NOTFOUND:
msg = _free(msg);
@@ -245,14 +245,14 @@
rc = rpmpkgRead(item, fd, &sigh, &msg);
switch (rc) {
default:
- rpmError(RPMERR_SIGGEN, "%s: %s: %s", fn, item,
+ rpmlog(RPMLOG_ERR, "%s: %s: %s", fn, item,
(msg && *msg ? msg : "\n"));
msg = _free(msg);
goto exit;
/*@notreached@*/ break;
case RPMRC_OK:
if (sigh == NULL) {
- rpmError(RPMERR_SIGGEN, _("%s: No signature available\n"), fn);
+ rpmlog(RPMLOG_ERR, _("%s: No signature available\n"), fn);
rc = RPMRC_FAIL;
goto exit;
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/psm.c
============================================================================
$ cvs diff -u -r2.234 -r2.235 psm.c
--- rpm/lib/psm.c 11 Oct 2007 13:04:27 -0000 2.234
+++ rpm/lib/psm.c 11 Oct 2007 19:14:37 -0000 2.235
@@ -205,7 +205,7 @@
headerIsEntry(h, RPMTAG_ARCH) != 0);
if (!isSource) {
- rpmError(RPMERR_NOTSRPM, _("source package expected, binary found\n"));
+ rpmlog(RPMLOG_ERR, _("source package expected, binary found\n"));
rpmrc = RPMRC_FAIL;
goto exit;
}
@@ -331,7 +331,7 @@
(void) stpcpy( stpcpy( stpcpy(t, _specdir), "/"), fi->bnl[i]);
specFile = t;
} else {
- rpmError(RPMERR_NOSPEC, _("source package contains no .spec file\n"));
+ rpmlog(RPMLOG_ERR, _("source package contains no .spec file\n"));
rpmrc = RPMRC_FAIL;
goto exit;
}
@@ -870,18 +870,18 @@
/* XXX filter order dependent multilib "other" arch helper error. */
if (!(psm->sq.reaped >= 0 && !strcmp(argv[0], "/usr/sbin/glibc_post_upgrade") && WEXITSTATUS(psm->sq.status) == 110)) {
if (psm->sq.reaped < 0) {
- rpmError(RPMERR_SCRIPT,
+ rpmlog(RPMLOG_ERR,
_("%s(%s) scriptlet failed, waitpid(%d) rc %d: %s\n"),
sln, NVRA, psm->sq.child, psm->sq.reaped, strerror(errno));
goto exit;
} else
if (!WIFEXITED(psm->sq.status) || WEXITSTATUS(psm->sq.status)) {
if (WIFSIGNALED(psm->sq.status)) {
- rpmError(RPMERR_SCRIPT,
+ rpmlog(RPMLOG_ERR,
_("%s(%s) scriptlet failed, signal %d\n"),
sln, NVRA, WTERMSIG(psm->sq.status));
} else {
- rpmError(RPMERR_SCRIPT,
+ rpmlog(RPMLOG_ERR,
_("%s(%s) scriptlet failed, exit status %d\n"),
sln, NVRA, WEXITSTATUS(psm->sq.status));
}
@@ -1696,7 +1696,7 @@
if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_NOPRE)) {
rc = rpmpsmNext(psm, PSM_SCRIPT);
if (rc != RPMRC_OK) {
- rpmError(RPMERR_SCRIPT,
+ rpmlog(RPMLOG_ERR,
_("%s: %s scriptlet failed (%d), skipping %s\n"),
psm->stepName, tag2sln(psm->scriptTag), rc,
rpmteNEVR(psm->te));
@@ -1790,7 +1790,7 @@
rc = rpmpkgWrite(item, psm->fd, l, &NEVR);
}
if (rc != RPMRC_OK) {
- rpmError(RPMERR_NOSPACE, _("Unable to write package: %s\n"),
+ rpmlog(RPMLOG_ERR, _("Unable to write package: %s\n"),
Fstrerror(psm->fd));
break;
}
@@ -1804,7 +1804,7 @@
/* Reallocate the signature into one contiguous region. */
sigh = headerReload(sigh, RPMTAG_HEADERSIGNATURES);
if (sigh == NULL) {
- rpmError(RPMERR_NOSPACE, _("Unable to reload signature header\n"));
+ rpmlog(RPMLOG_ERR, _("Unable to reload signature header\n"));
rc = RPMRC_FAIL;
break;
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/query.c
============================================================================
$ cvs diff -u -r2.185 -r2.186 query.c
--- rpm/lib/query.c 11 Oct 2007 02:04:38 -0000 2.185
+++ rpm/lib/query.c 11 Oct 2007 19:14:37 -0000 2.186
@@ -118,7 +118,7 @@
str = headerSprintf(h, qfmt, rpmTagTable, rpmHeaderFormats, &errstr);
/*@=modobserver@*/
if (str == NULL)
- rpmError(RPMERR_QFMT, _("incorrect format: %s\n"), errstr);
+ rpmlog(RPMLOG_ERR, _("incorrect format: %s\n"), errstr);
return str;
}
@@ -305,8 +305,7 @@
/*@=nullpass@*/
te += strlen(te);
} else {
- rpmError(RPMERR_INTERNAL,
- _("package has not file owner/group lists\n"));
+ rpmlog(RPMLOG_CRIT, _("package without owner/group tags\n"));
}
sprintf(te, " %s %s %u ",
@@ -336,8 +335,7 @@
/*@=nullpass@*/
te += strlen(te);
} else {
- rpmError(RPMERR_INTERNAL,
- _("package has neither file owner or id lists\n"));
+ rpmlog(RPMLOG_CRIT, _("package without owner/group tags\n"));
}
}
flushBuffer(&t, &te, 0);
@@ -493,7 +491,7 @@
case RPMQV_GROUP:
qva->qva_mi = rpmtsInitIterator(ts, RPMTAG_GROUP, arg, 0);
if (qva->qva_mi == NULL) {
- rpmError(RPMERR_QUERYINFO,
+ rpmlog(RPMLOG_ERR,
_("group %s does not contain any packages\n"), arg);
res = 1;
} else
@@ -503,7 +501,7 @@
case RPMQV_TRIGGEREDBY:
qva->qva_mi = rpmtsInitIterator(ts, RPMTAG_TRIGGERNAME, arg, 0);
if (qva->qva_mi == NULL) {
- rpmError(RPMERR_QUERYINFO, _("no package triggers %s\n"), arg);
+ rpmlog(RPMLOG_ERR, _("no package triggers %s\n"), arg);
res = 1;
} else
res = rpmcliShowMatches(qva, ts);
@@ -518,7 +516,7 @@
for (i = 0, s = arg; *s && isxdigit(*s); s++, i++)
{};
if (i != 32) {
- rpmError(RPMERR_QUERYINFO, _("malformed %s: %s\n"), "pkgid", arg);
+ rpmlog(RPMLOG_ERR, _("malformed %s: %s\n"), "pkgid", arg);
return 1;
}
@@ -530,7 +528,7 @@
? RPMTAG_SOURCEPKGID : RPMTAG_PKGID);
qva->qva_mi = rpmtsInitIterator(ts, tag, MD5, sizeof(MD5));
if (qva->qva_mi == NULL) {
- rpmError(RPMERR_QUERYINFO, _("no package matches %s: %s\n"),
+ rpmlog(RPMLOG_ERR, _("no package matches %s: %s\n"),
"pkgid", arg);
res = 1;
} else
@@ -541,13 +539,13 @@
for (i = 0, s = arg; *s && isxdigit(*s); s++, i++)
{};
if (i != 40) {
- rpmError(RPMERR_QUERYINFO, _("malformed %s: %s\n"), "hdrid", arg);
+ rpmlog(RPMLOG_ERR, _("malformed %s: %s\n"), "hdrid", arg);
return 1;
}
qva->qva_mi = rpmtsInitIterator(ts, RPMTAG_SHA1HEADER, arg, 0);
if (qva->qva_mi == NULL) {
- rpmError(RPMERR_QUERYINFO, _("no package matches %s: %s\n"),
+ rpmlog(RPMLOG_ERR, _("no package matches %s: %s\n"),
"hdrid", arg);
res = 1;
} else
@@ -563,7 +561,7 @@
for (dlen = 0, s = arg; *s && isxdigit(*s); s++, dlen++)
{};
if ((dlen & 1) || dlen < 8) {
- rpmError(RPMERR_QUERY, _("malformed %s: %s\n"), "fileid", arg);
+ rpmlog(RPMLOG_ERR, _("malformed %s: %s\n"), "fileid", arg);
return 1;
}
@@ -574,7 +572,7 @@
qva->qva_mi = rpmtsInitIterator(ts, RPMTAG_FILEDIGESTS, digest, dlen);
if (qva->qva_mi == NULL) {
- rpmError(RPMERR_QUERYINFO, _("no package matches %s: %s\n"),
+ rpmlog(RPMLOG_ERR, _("no package matches %s: %s\n"),
"fileid", arg);
res = 1;
} else
@@ -598,12 +596,12 @@
}
iid = (unsigned) strtoul(myarg, &end, mybase);
if ((*end) || (end == arg) || (iid == UINT_MAX)) {
- rpmError(RPMERR_QUERY, _("malformed %s: %s\n"), "tid", arg);
+ rpmlog(RPMLOG_ERR, _("malformed %s: %s\n"), "tid", arg);
return 1;
}
qva->qva_mi = rpmtsInitIterator(ts, RPMTAG_INSTALLTID, &iid, sizeof(iid));
if (qva->qva_mi == NULL) {
- rpmError(RPMERR_QUERYINFO, _("no package matches %s: %s\n"),
+ rpmlog(RPMLOG_ERR, _("no package matches %s: %s\n"),
"tid", arg);
res = 1;
} else
@@ -614,7 +612,7 @@
case RPMQV_WHATREQUIRES:
qva->qva_mi = rpmtsInitIterator(ts, RPMTAG_REQUIRENAME, arg, 0);
if (qva->qva_mi == NULL) {
- rpmError(RPMERR_QUERYINFO, _("no package requires %s\n"), arg);
+ rpmlog(RPMLOG_ERR, _("no package requires %s\n"), arg);
res = 1;
} else
res = rpmcliShowMatches(qva, ts);
@@ -625,7 +623,7 @@
provides_checked = 1;
qva->qva_mi = rpmtsInitIterator(ts, RPMTAG_PROVIDENAME, arg, 0);
if (qva->qva_mi == NULL) {
- rpmError(RPMERR_QUERYINFO, _("no package provides %s\n"), arg);
+ rpmlog(RPMLOG_ERR, _("no package provides %s\n"), arg);
res = 1;
} else
res = rpmcliShowMatches(qva, ts);
@@ -659,9 +657,9 @@
if (qva->qva_mi == NULL) {
struct stat sb;
if (Lstat(fn, &sb) != 0)
- rpmError(RPMERR_QUERY, _("file %s: %s\n"), fn, strerror(errno));
+ rpmlog(RPMLOG_ERR, _("file %s: %s\n"), fn, strerror(errno));
else
- rpmError(RPMERR_QUERYINFO,
+ rpmlog(RPMLOG_ERR,
_("file %s is not owned by any package\n"), fn);
res = 1;
} else
@@ -687,13 +685,13 @@
}
recOffset = (unsigned) strtoul(myarg, &end, mybase);
if ((*end) || (end == arg) || (recOffset == UINT_MAX)) {
- rpmError(RPMERR_QUERYINFO, _("invalid package number: %s\n"), arg);
+ rpmlog(RPMLOG_ERR, _("invalid package number: %s\n"), arg);
return 1;
}
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,
+ rpmlog(RPMLOG_ERR,
_("record %u could not be read\n"), recOffset);
res = 1;
} else
@@ -704,13 +702,13 @@
/* XXX HACK to get rpmdbFindByLabel out of the API */
qva->qva_mi = rpmtsInitIterator(ts, RPMDBI_LABEL, arg, 0);
if (qva->qva_mi == NULL) {
- rpmError(RPMERR_QUERYINFO, _("package %s is not installed\n"), arg);
+ rpmlog(RPMLOG_ERR, _("package %s is not installed\n"), arg);
res = 1;
} else {
res = rpmcliShowMatches(qva, ts);
/* detect foo.bogusarch empty iterations. */
if (qva->qva_showOK == 0 && qva->qva_showFAIL == 0) {
- rpmError(RPMERR_QUERYINFO, _("package %s is not installed\n"), arg);
+ rpmlog(RPMLOG_ERR, _("package %s is not installed\n"), arg);
res = 1;
}
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmchecksig.c
============================================================================
$ cvs diff -u -r1.150 -r1.151 rpmchecksig.c
--- rpm/lib/rpmchecksig.c 11 Oct 2007 13:04:27 -0000 1.150
+++ rpm/lib/rpmchecksig.c 11 Oct 2007 19:14:37 -0000 1.151
@@ -56,7 +56,7 @@
if (*fdp == NULL && fnp != NULL && *fnp != NULL) {
fd = Fopen(*fnp, ((flags & O_WRONLY) ? "w.fdio" : "r.fdio"));
if (fd == NULL || Ferror(fd)) {
- rpmError(RPMERR_OPEN, _("%s: open failed: %s\n"), *fnp,
+ rpmlog(RPMLOG_ERR, _("%s: open failed: %s\n"), *fnp,
Fstrerror(fd));
return 1;
}
@@ -68,7 +68,7 @@
if (*fdp == NULL && (fnp == NULL || *fnp == NULL)) {
fn = NULL;
if (rpmTempFile(NULL, (fnp ? &fn : NULL), &fd)) {
- rpmError(RPMERR_MAKETEMP, _("rpmTempFile failed\n"));
+ rpmlog(RPMLOG_ERR, _("rpmTempFile failed\n"));
return 1;
}
if (fnp != NULL)
@@ -222,7 +222,7 @@
msg = NULL;
rc = rpmpkgRead(item, fd, &lead, &msg);
if (rc != RPMRC_OK) {
- rpmError(RPMERR_READLEAD, "%s: %s: %s\n", fn, item, msg);
+ rpmlog(RPMLOG_ERR, "%s: %s: %s\n", fn, item, msg);
msg = _free(msg);
goto exit;
}
@@ -235,14 +235,14 @@
rc = rpmpkgRead(item, fd, &sigh, &msg);
switch (rc) {
default:
- rpmError(RPMERR_SIGGEN, "%s: %s: %s", fn, item,
+ rpmlog(RPMLOG_ERR, "%s: %s: %s", fn, item,
(msg && *msg ? msg : "\n"));
msg = _free(msg);
goto exit;
/*@notreached@*/ /*@switchbreak@*/ break;
case RPMRC_OK:
if (sigh == NULL) {
- rpmError(RPMERR_SIGGEN, _("%s: No signature available\n"), fn);
+ rpmlog(RPMLOG_ERR, _("%s: No signature available\n"), fn);
goto exit;
}
/*@switchbreak@*/ break;
@@ -391,8 +391,7 @@
const char item[] = "Lead";
rc = rpmpkgWrite(item, ofd, lead, NULL);
if (rc != RPMRC_OK) {
- rpmError(RPMERR_WRITELEAD, "%s: %s: %s\n", tfn, item,
- Fstrerror(ofd));
+ rpmlog(RPMLOG_ERR, "%s: %s: %s\n", tfn, item, Fstrerror(ofd));
goto exit;
}
}
@@ -401,7 +400,7 @@
const char item[] = "Signature";
rc = rpmpkgWrite(item, ofd, sigh, NULL);
if (rc != RPMRC_OK) {
- rpmError(RPMERR_SIGGEN, "%s: %s: %s\n", tfn, item,
+ rpmlog(RPMLOG_ERR, "%s: %s: %s\n", tfn, item,
Fstrerror(ofd));
goto exit;
}
@@ -776,7 +775,7 @@
msg = NULL;
rc = rpmpkgRead(item, fd, NULL, &msg);
if (rc != RPMRC_OK) {
- rpmError(RPMERR_READLEAD, "%s: %s: %s\n", fn, item, msg);
+ rpmlog(RPMLOG_ERR, "%s: %s: %s\n", fn, item, msg);
msg = _free(msg);
res++;
goto exit;
@@ -789,7 +788,7 @@
rc = rpmpkgRead(item, fd, &sigh, &msg);
switch (rc) {
default:
- rpmError(RPMERR_SIGGEN, "%s: %s: %s", fn, item,
+ rpmlog(RPMLOG_ERR, "%s: %s: %s", fn, item,
(msg && *msg ? msg : "\n"));
msg = _free(msg);
res++;
@@ -797,7 +796,7 @@
/*@notreached@*/ /*@switchbreak@*/ break;
case RPMRC_OK:
if (sigh == NULL) {
- rpmError(RPMERR_SIGGEN, _("%s: No signature available\n"), fn);
+ rpmlog(RPMLOG_ERR, _("%s: No signature available\n"), fn);
res++;
goto exit;
}
@@ -912,7 +911,7 @@
(_print_pkts & rpmIsDebug()));
if (sigp->version != 3 && sigp->version != 4) {
- rpmError(RPMERR_SIGVFY,
+ rpmlog(RPMLOG_ERR,
_("skipping package %s with unverifiable V%u signature\n"),
fn, sigp->version);
res++;
@@ -1094,9 +1093,9 @@
if (res2) {
if (rpmIsVerbose()) {
- rpmError(RPMERR_SIGVFY, "%s", buf);
+ rpmlog(RPMLOG_ERR, "%s", buf);
} else {
- rpmError(RPMERR_SIGVFY, "%s%s%s%s%s%s%s%s\n", buf,
+ rpmlog(RPMLOG_ERR, "%s%s%s%s%s%s%s%s\n", buf,
_("NOT OK"),
(missingKeys[0] != '\0') ? _(" (MISSING KEYS:") : "",
missingKeys,
@@ -1108,9 +1107,9 @@
}
} else {
if (rpmIsVerbose()) {
- rpmError(RPMERR_SIGVFY, "%s", buf);
+ rpmlog(RPMLOG_ERR, "%s", buf);
} else {
- rpmError(RPMERR_SIGVFY, "%s%s%s%s%s%s%s%s\n", buf,
+ rpmlog(RPMLOG_ERR, "%s%s%s%s%s%s%s%s\n", buf,
_("OK"),
(missingKeys[0] != '\0') ? _(" (MISSING KEYS:") : "",
missingKeys,
@@ -1172,7 +1171,7 @@
fd = Fopen(fn, "r.fdio");
if (fd == NULL || Ferror(fd)) {
- rpmError(RPMERR_OPEN, _("%s: open failed: %s\n"),
+ rpmlog(RPMLOG_ERR, _("%s: open failed: %s\n"),
fn, Fstrerror(fd));
res++;
} else if (rpmVerifySignatures(qva, ts, fd, fn)) {
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmfc.c
============================================================================
$ cvs diff -u -r1.19 -r1.20 rpmfc.c
--- rpm/lib/rpmfc.c 11 Oct 2007 13:04:27 -0000 1.19
+++ rpm/lib/rpmfc.c 11 Oct 2007 19:14:37 -0000 1.20
@@ -1271,8 +1271,8 @@
s = _free(s);
if (sb_stdout == NULL) {
- rc = RPMERR_EXEC;
- rpmError(rc, _("Failed to find %s:\n"), dm->msg);
+ rpmlog(RPMLOG_ERR, _("Failed to find %s:\n"), dm->msg);
+ rc = RPMRC_FAIL;
break;
}
@@ -1283,7 +1283,7 @@
sb_stdout = freeStringBuf(sb_stdout);
if (rc) {
- rpmError(rc, _("Failed to find %s:\n"), dm->msg);
+ rpmlog(RPMLOG_ERR, _("Failed to find %s:\n"), dm->msg);
break;
}
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmgi.c
============================================================================
$ cvs diff -u -r2.34 -r2.35 rpmgi.c
--- rpm/lib/rpmgi.c 30 Sep 2007 20:38:25 -0000 2.34
+++ rpm/lib/rpmgi.c 11 Oct 2007 19:14:37 -0000 2.35
@@ -94,7 +94,7 @@
fd = Fopen(fn, fmode);
if (fd == NULL || Ferror(fd)) {
- rpmError(RPMERR_OPEN, _("open of %s failed: %s\n"), fn, Fstrerror(fd));
+ rpmlog(RPMLOG_ERR, _("open of %s failed: %s\n"), fn, Fstrerror(fd));
if (fd != NULL) (void) Fclose(fd);
fd = NULL;
}
@@ -425,7 +425,7 @@
if (*a != '\0') { /* XXX HACK: permit '=foo' */
tag = tagValue(a);
if (tag < 0) {
- rpmError(RPMERR_QUERYINFO, _("unknown tag: \"%s\"\n"), a);
+ rpmlog(RPMLOG_ERR, _("unknown tag: \"%s\"\n"), a);
res = 1;
}
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpminstall.c
============================================================================
$ cvs diff -u -r1.166 -r1.167 rpminstall.c
--- rpm/lib/rpminstall.c 30 Sep 2007 20:38:25 -0000 1.166
+++ rpm/lib/rpminstall.c 11 Oct 2007 19:14:37 -0000 1.167
@@ -122,7 +122,7 @@
fd = Fopen(filename, "r.fdio");
/*@-type@*/ /* FIX: still necessary? */
if (fd == NULL || Ferror(fd)) {
- rpmError(RPMERR_OPEN, _("open of %s failed: %s\n"), filename,
+ rpmlog(RPMLOG_ERR, _("open of %s failed: %s\n"), filename,
Fstrerror(fd));
if (fd != NULL) {
xx = Fclose(fd);
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmrollback.c
============================================================================
$ cvs diff -u -r1.14 -r1.15 rpmrollback.c
--- rpm/lib/rpmrollback.c 30 Sep 2007 20:38:26 -0000 1.14
+++ rpm/lib/rpmrollback.c 11 Oct 2007 19:14:37 -0000 1.15
@@ -163,7 +163,7 @@
fd = Fopen(av[i], "r.fdio");
if (fd == NULL || Ferror(fd)) {
- rpmError(RPMERR_OPEN, _("open of %s failed: %s\n"), av[i],
+ rpmlog(RPMLOG_ERR, _("open of %s failed: %s\n"), av[i],
Fstrerror(fd));
if (fd != NULL) (void) Fclose(fd);
continue;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmts.c
============================================================================
$ cvs diff -u -r2.105 -r2.106 rpmts.c
--- rpm/lib/rpmts.c 7 Oct 2007 14:00:13 -0000 2.105
+++ rpm/lib/rpmts.c 11 Oct 2007 19:14:37 -0000 2.106
@@ -190,7 +190,7 @@
case '(':
/* XXX Fail if nested parens. */
if (level++ != 0) {
- rpmError(RPMERR_QFMT, _("extra '(' in package label: %s\n"), keyp);
+ rpmlog(RPMLOG_ERR, _("extra '(' in package label: %s\n"), keyp);
return NULL;
}
/* Parse explicit epoch. */
@@ -208,7 +208,7 @@
case ')':
/* XXX Fail if nested parens. */
if (--level != 0) {
- rpmError(RPMERR_QFMT, _("missing '(' in package label: %s\n"), keyp);
+ rpmlog(RPMLOG_ERR, _("missing '(' in package label: %s\n"), keyp);
return NULL;
}
/* Don't copy trailing ')' */
@@ -216,7 +216,7 @@
}
}
if (level) {
- rpmError(RPMERR_QFMT, _("missing ')' in package label: %s\n"), keyp);
+ rpmlog(RPMLOG_ERR, _("missing ')' in package label: %s\n"), keyp);
return NULL;
}
*t = '\0';
@@ -394,7 +394,7 @@
bh = headerFree(bh);
qfmt = _free(qfmt);
if (str == NULL) {
- rpmError(RPMERR_QFMT, _("incorrect solve path format: %s\n"), errstr);
+ rpmlog(RPMLOG_ERR, _("incorrect solve path format: %s\n"), errstr);
goto exit;
}
@@ -404,7 +404,7 @@
fd = Fopen(str, "r.fdio");
if (fd == NULL || Ferror(fd)) {
- rpmError(RPMERR_OPEN, _("open of %s failed: %s\n"), str,
+ rpmlog(RPMLOG_ERR, _("open of %s failed: %s\n"), str,
Fstrerror(fd));
if (fd != NULL) {
xx = Fclose(fd);
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmdb.c
============================================================================
$ cvs diff -u -r1.171 -r1.172 rpmdb.c
--- rpm/rpmdb/rpmdb.c 11 Oct 2007 16:23:05 -0000 1.171
+++ rpm/rpmdb/rpmdb.c 11 Oct 2007 19:14:41 -0000 1.172
@@ -842,7 +842,7 @@
str = headerSprintf(h, qfmt, rpmTagTable, hdrfmts, &errstr);
/*@=modobserver@*/
if (str == NULL)
- rpmError(RPMERR_QFMT, _("incorrect format: \"%s\": %s\n"), qfmt, errstr);
+ rpmlog(RPMLOG_ERR, _("incorrect format: \"%s\": %s\n"), qfmt, errstr);
return str;
}
@@ -3905,7 +3905,7 @@
rootdbpath, newrootdbpath);
if (!Access(newrootdbpath, F_OK)) {
- rpmError(RPMERR_MKDIR, _("temporary database %s already exists\n"),
+ rpmlog(RPMLOG_ERR, _("temporary database %s already exists\n"),
newrootdbpath);
rc = 1;
goto exit;
@@ -3913,7 +3913,7 @@
rpmMessage(RPMMESS_DEBUG, D_("creating directory %s\n"), newrootdbpath);
if (Mkdir(newrootdbpath, 0755)) {
- rpmError(RPMERR_MKDIR, _("creating directory %s: %s\n"),
+ rpmlog(RPMLOG_ERR, _("creating directory %s: %s\n"),
newrootdbpath, strerror(errno));
rc = 1;
goto exit;
@@ -3959,7 +3959,7 @@
headerIsEntry(h, RPMTAG_RELEASE) &&
headerIsEntry(h, RPMTAG_BUILDTIME)))
{
- rpmError(RPMERR_INTERNAL,
+ rpmlog(RPMLOG_WARNING,
_("header #%u in the database is bad -- skipping.\n"),
_RECNUM);
continue;
@@ -3967,7 +3967,7 @@
if (!headerIsEntry(h, RPMTAG_SOURCERPM)
&& headerIsEntry(h, RPMTAG_ARCH))
{
- rpmError(RPMERR_INTERNAL,
+ rpmlog(RPMLOG_WARNING,
_("header #%u in the database is SRPM -- skipping.\n"),
_RECNUM);
continue;
@@ -4007,7 +4007,7 @@
}
if (rc) {
- rpmError(RPMERR_INTERNAL,
+ rpmlog(RPMLOG_ERR,
_("cannot add record originally at %u\n"), _RECNUM);
failed = 1;
break;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/signature.c
============================================================================
$ cvs diff -u -r1.4 -r1.5 signature.c
--- rpm/rpmdb/signature.c 11 Oct 2007 13:04:28 -0000 1.4
+++ rpm/rpmdb/signature.c 11 Oct 2007 19:14:41 -0000 1.5
@@ -89,18 +89,18 @@
case URL_IS_UNKNOWN:
{ struct stat sb, sb2;
if (!stat(tfn, &sb) && S_ISLNK(sb.st_mode)) {
- rpmError(RPMERR_SCRIPT, _("error creating temporary file %s\n"), tfn);
+ rpmlog(RPMLOG_ERR, _("error creating temporary file %s\n"), tfn);
goto errxit;
}
if (sb.st_nlink != 1) {
- rpmError(RPMERR_SCRIPT, _("error creating temporary file %s\n"), tfn);
+ rpmlog(RPMLOG_ERR, _("error creating temporary file %s\n"), tfn);
goto errxit;
}
if (fstat(Fileno(fd), &sb2) == 0) {
if (sb2.st_ino != sb.st_ino || sb2.st_dev != sb.st_dev) {
- rpmError(RPMERR_SCRIPT, _("error creating temporary file %s\n"), tfn);
+ rpmlog(RPMLOG_ERR, _("error creating temporary file %s\n"), tfn);
goto errxit;
}
}
@@ -292,14 +292,14 @@
(void)waitpid(pid, &status, 0);
if (!WIFEXITED(status) || WEXITSTATUS(status)) {
- rpmError(RPMERR_SIGGEN, _("pgp failed\n"));
+ rpmlog(RPMLOG_ERR, _("pgp failed\n"));
return 1;
}
if (Stat(sigfile, &st)) {
/* PGP failed to write signature */
if (sigfile) (void) Unlink(sigfile); /* Just in case */
- rpmError(RPMERR_SIGGEN, _("pgp failed to write signature\n"));
+ rpmlog(RPMLOG_ERR, _("pgp failed to write signature\n"));
return 1;
}
@@ -318,7 +318,7 @@
}
if (rc != *pktlenp) {
*pktp = _free(*pktp);
- rpmError(RPMERR_SIGGEN, _("unable to read the signature\n"));
+ rpmlog(RPMLOG_ERR, _("unable to read the signature\n"));
return 1;
}
}
@@ -409,7 +409,7 @@
key = keyctl_search(keyring, "user", "rpm:passwd", 0);
pw = NULL;
if ((xx = keyctl_read_alloc(key, (void **)&pw)) < 0) {
- rpmError(RPMERR_SIGGEN, _("Failed %s(%d) key(0x%lx): %s\n"),
+ rpmlog(RPMLOG_ERR, _("Failed %s(%d) key(0x%lx): %s\n"),
"keyctl_read_alloc of key", xx, key, strerror(errno));
return 1;
}
@@ -435,14 +435,14 @@
(void) waitpid(pid, &status, 0);
if (!WIFEXITED(status) || WEXITSTATUS(status)) {
- rpmError(RPMERR_SIGGEN, _("gpg exec failed (%d)\n"), WEXITSTATUS(status));
+ rpmlog(RPMLOG_ERR, _("gpg exec failed (%d)\n"), WEXITSTATUS(status));
return 1;
}
if (Stat(sigfile, &st)) {
/* GPG failed to write signature */
if (sigfile) (void) Unlink(sigfile); /* Just in case */
- rpmError(RPMERR_SIGGEN, _("gpg failed to write signature\n"));
+ rpmlog(RPMLOG_ERR, _("gpg failed to write signature\n"));
return 1;
}
@@ -461,7 +461,7 @@
}
if (rc != *pktlenp) {
*pktp = _free(*pktp);
- rpmError(RPMERR_SIGGEN, _("unable to read the signature\n"));
+ rpmlog(RPMLOG_ERR, _("unable to read the signature\n"));
return 1;
}
}
@@ -777,7 +777,7 @@
key = keyctl_search(keyring, "user", "rpm:passwd", 0);
pw = NULL;
if ((xx = keyctl_read_alloc(key, (void **)&pw)) < 0) {
- rpmError(RPMERR_SIGGEN, _("Failed %s(%d) key(0x%lx): %s\n"),
+ rpmlog(RPMLOG_ERR, _("Failed %s(%d) key(0x%lx): %s\n"),
"keyctl_read_alloc of key", xx, key, strerror(errno));
return 1;
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/mire.c
============================================================================
$ cvs diff -u -r1.6 -r1.7 mire.c
--- rpm/rpmio/mire.c 6 Oct 2007 21:33:50 -0000 1.6
+++ rpm/rpmio/mire.c 11 Oct 2007 19:14:41 -0000 1.7
@@ -111,7 +111,7 @@
char msg[256];
(void) regerror(rc, mire->preg, msg, sizeof(msg)-1);
msg[sizeof(msg)-1] = '\0';
- rpmError(RPMERR_REGEXEC, "%s: regexec failed: %s\n",
+ rpmlog(RPMLOG_ERR, _("%s: regexec failed: %s\n"),
mire->pattern, msg);
rc = -1;
}
@@ -152,7 +152,7 @@
char msg[256];
(void) regerror(rc, mire->preg, msg, sizeof(msg)-1);
msg[sizeof(msg)-1] = '\0';
- rpmError(RPMERR_REGCOMP, "%s: regcomp failed: %s\n",
+ rpmlog(RPMLOG_ERR, _("%s: regcomp failed: %s\n"),
mire->pattern, msg);
}
break;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmlua.c
============================================================================
$ cvs diff -u -r2.22 -r2.23 rpmlua.c
--- rpm/rpmio/rpmlua.c 6 Oct 2007 21:33:50 -0000 2.22
+++ rpm/rpmio/rpmlua.c 11 Oct 2007 19:14:41 -0000 2.23
@@ -500,7 +500,7 @@
if (name == NULL)
name = "<lua>";
if (luaL_loadbuffer(L, script, strlen(script), name) != 0) {
- rpmError(RPMERR_SCRIPT,
+ rpmlog(RPMLOG_ERR,
_("invalid syntax in lua scriptlet: %s\n"),
lua_tostring(L, -1));
ret = -1;
@@ -517,12 +517,12 @@
if (name == NULL)
name = "<lua>";
if (luaL_loadbuffer(L, script, strlen(script), name) != 0) {
- rpmError(RPMERR_SCRIPT, _("invalid syntax in lua script: %s\n"),
+ rpmlog(RPMLOG_ERR, _("invalid syntax in lua script: %s\n"),
lua_tostring(L, -1));
lua_pop(L, 1);
ret = -1;
} else if (lua_pcall(L, 0, 0, 0) != 0) {
- rpmError(RPMERR_SCRIPT, _("lua script failed: %s\n"),
+ rpmlog(RPMLOG_ERR, _("lua script failed: %s\n"),
lua_tostring(L, -1));
lua_pop(L, 1);
ret = -1;
@@ -536,12 +536,12 @@
lua_State *L = lua->L;
int ret = 0;
if (luaL_loadfile(L, filename) != 0) {
- rpmError(RPMERR_SCRIPT, _("invalid syntax in lua file: %s\n"),
+ rpmlog(RPMLOG_ERR, _("invalid syntax in lua file: %s\n"),
lua_tostring(L, -1));
lua_pop(L, 1);
ret = -1;
} else if (lua_pcall(L, 0, 0, 0) != 0) {
- rpmError(RPMERR_SCRIPT, _("lua script failed: %s\n"),
+ rpmlog(RPMLOG_ERR, _("lua script failed: %s\n"),
lua_tostring(L, -1));
lua_pop(L, 1);
ret = -1;
@@ -691,7 +691,7 @@
}
}
if (lua_pcall(L, 1, 1, 0) != 0) {
- rpmError(RPMERR_SCRIPT, _("lua hook failed: %s\n"),
+ rpmlog(RPMLOG_ERR, _("lua hook failed: %s\n"),
lua_tostring(L, -1));
lua_pop(L, 1);
} else {
@@ .
Received on Thu Oct 11 21:14:42 2007