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: 19-Nov-2007 18:07:48
Branch: HEAD Handle: 2007111917074602
Modified files:
rpm CHANGES
rpm/build build.c buildio.h files.c pack.c rpmbuild.h
rpm/lib cpio.c fsm.c rpmfc.c rpmlib.h tar.c
rpm/rpmconstant rpmh2tbl
rpm/rpmdb signature.c
rpm/rpmio Makefile.am macro.c mire.c rpmlua.c rpmmg.c
Removed files:
rpm/rpmio rpmerr.h
Log:
- doScript: use pid_t, not int.
- eliminate rpmerr.h, use rpmlog.h instead.
Summary:
Revision Changes Path
1.1848 +5 -1 rpm/CHANGES
2.119 +15 -14 rpm/build/build.c
2.34 +2 -2 rpm/build/buildio.h
1.289 +3 -3 rpm/build/files.c
2.251 +31 -33 rpm/build/pack.c
2.76 +4 -4 rpm/build/rpmbuild.h
2.136 +0 -1 rpm/lib/cpio.c
2.134 +0 -2 rpm/lib/fsm.c
1.37 +1 -1 rpm/lib/rpmfc.c
2.447 +0 -1 rpm/lib/rpmlib.h
1.6 +0 -1 rpm/lib/tar.c
1.6 +1 -4 rpm/rpmconstant/rpmh2tbl
1.28 +1 -1 rpm/rpmdb/signature.c
1.108 +1 -1 rpm/rpmio/Makefile.am
2.153 +0 -1 rpm/rpmio/macro.c
1.8 +1 -1 rpm/rpmio/mire.c
2.27 +0 -152 rpm/rpmio/rpmerr.h
2.28 +1 -1 rpm/rpmio/rpmlua.c
2.6 +1 -1 rpm/rpmio/rpmmg.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1847 -r1.1848 CHANGES
--- rpm/CHANGES 19 Nov 2007 16:14:49 -0000 1.1847
+++ rpm/CHANGES 19 Nov 2007 17:07:46 -0000 1.1848
@@ -1,5 +1,9 @@
-5.0a1 -> 5.0a2:
+5.0a2 -> 5.0a3:
+ - jbj: doScript: use pid_t, not int.
+ - jbj: eliminate rpmerr.h, use rpmlog.h instead.
- jbj: eliminate rpmMessage and RPMMESS_FOO constants, use rpmlog instead.
+
+5.0a1 -> 5.0a2:
- jbj: fix: don't add RPMTAG_ARCH to pubkeys, pubkeys cannot be erased.
- afb: make devtool %standalone include the required %{_rpmhome}/magic.
- jbj: fix: handle absolute paths to spec files again.
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/build.c
============================================================================
$ cvs diff -u -r2.118 -r2.119 build.c
--- rpm/build/build.c 11 Oct 2007 19:44:21 -0000 2.118
+++ rpm/build/build.c 19 Nov 2007 17:07:46 -0000 2.119
@@ -63,7 +63,7 @@
/*
* @todo Single use by %%doc in files.c prevents static.
*/
-int doScript(Spec spec, int what, const char *name, StringBuf sb, int test)
+rpmRC doScript(Spec spec, int what, const char *name, StringBuf sb, int test)
{
const char * rootURL = spec->rootURL;
const char * rootDir;
@@ -83,9 +83,10 @@
FD_t fd;
FD_t xfd;
- int child;
+ pid_t pid;
+ pid_t child;
int status;
- int rc;
+ rpmRC rc;
/*@-branchstate@*/
switch (what) {
@@ -142,13 +143,13 @@
/*@=branchstate@*/
if ((what != RPMBUILD_RMBUILD) && sb == NULL) {
- rc = 0;
+ rc = RPMRC_OK;
goto exit;
}
if (rpmTempFile(rootURL, &scriptName, &fd) || fd == NULL || Ferror(fd)) {
rpmlog(RPMLOG_ERR, _("Unable to open temp file.\n"));
- rc = RPMERR_SCRIPT;
+ rc = RPMRC_FAIL;
goto exit;
}
@@ -161,7 +162,7 @@
/*@-type@*/ /* FIX: cast? */
if ((fp = fdGetFp(xfd)) == NULL) {
- rc = RPMERR_SCRIPT;
+ rc = RPMRC_FAIL;
goto exit;
}
/*@=type@*/
@@ -192,7 +193,7 @@
(void) Fclose(xfd);
if (test) {
- rc = 0;
+ rc = RPMRC_OK;
goto exit;
}
@@ -201,7 +202,7 @@
/*@-boundsread@*/
if (buildDirURL && buildDirURL[0] != '/' &&
(urlSplit(buildDirURL, &u) != 0)) {
- rc = RPMERR_SCRIPT;
+ rc = RPMRC_FAIL;
goto exit;
}
/*@=boundsread@*/
@@ -245,18 +246,18 @@
_exit(-1);
}
- rc = waitpid(child, &status, 0);
+ pid = waitpid(child, &status, 0);
if (!WIFEXITED(status) || WEXITSTATUS(status)) {
rpmlog(RPMLOG_ERR, _("Bad exit status from %s (%s)\n"),
scriptName, name);
rc = RPMRC_FAIL;
} else
- rc = 0;
+ rc = RPMRC_OK;
exit:
if (scriptName) {
- if (!rc)
+ if (rc == RPMRC_OK)
(void) Unlink(scriptName);
scriptName = _free(scriptName);
}
@@ -289,9 +290,9 @@
return rc;
}
-int buildSpec(rpmts ts, Spec spec, int what, int test)
+rpmRC buildSpec(rpmts ts, Spec spec, int what, int test)
{
- int rc = 0;
+ rpmRC rc = RPMRC_OK;
if (!spec->recursing && spec->BACount) {
int x;
@@ -358,7 +359,7 @@
(void) Unlink(spec->specFile);
exit:
- if (rc && rpmlogGetNrecs() > 0) {
+ if (rc != RPMRC_OK && rpmlogGetNrecs() > 0) {
rpmlog(RPMLOG_NOTICE, _("\n\nRPM build errors:\n"));
rpmlogPrint(NULL);
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/buildio.h
============================================================================
$ cvs diff -u -r2.33 -r2.34 buildio.h
--- rpm/build/buildio.h 4 Nov 2007 19:37:02 -0000 2.33
+++ rpm/build/buildio.h 19 Nov 2007 17:07:46 -0000 2.34
@@ -58,9 +58,9 @@
* @param csa
* @param passPhrase
* @retval cookie generated cookie (i.e build host/time)
- * @return 0 on success
+ * @return RPMRC_OK on success
*/
-int writeRPM(Header * hdrp, /*@null@*/ unsigned char ** pkgidp,
+rpmRC writeRPM(Header * hdrp, /*@null@*/ unsigned char ** pkgidp,
const char * fileName,
CSA_t csa,
/*@null@*/ char * passPhrase,
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/files.c
============================================================================
$ cvs diff -u -r1.288 -r1.289 files.c
--- rpm/build/files.c 10 Nov 2007 18:06:41 -0000 1.288
+++ rpm/build/files.c 19 Nov 2007 17:07:46 -0000 1.289
@@ -2446,11 +2446,11 @@
if (installSpecialDoc) {
int _missing_doc_files_terminate_build =
rpmExpandNumeric("%{?_missing_doc_files_terminate_build}");
- int rc;
+ rpmRC rc;
rc = doScript(spec, RPMBUILD_STRINGBUF, "%doc", pkg->specialDoc, test);
- if (rc && _missing_doc_files_terminate_build)
- fl.processingFailed = rc;
+ if (rc != RPMRC_OK && _missing_doc_files_terminate_build)
+ fl.processingFailed = 1;
}
/* Reset for %doc */
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/pack.c
============================================================================
$ cvs diff -u -r2.250 -r2.251 pack.c
--- rpm/build/pack.c 17 Nov 2007 17:28:30 -0000 2.250
+++ rpm/build/pack.c 19 Nov 2007 17:07:46 -0000 2.251
@@ -58,7 +58,7 @@
/**
* @todo Create transaction set *much* earlier.
*/
-static int cpio_doio(FD_t fdo, /*@unused@*/ Header h, CSA_t csa,
+static rpmRC cpio_doio(FD_t fdo, /*@unused@*/ Header h, CSA_t csa,
const char * payload_format, const char * fmodeMacro)
/*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
/*@modifies fdo, csa, rpmGlobalMacroContext,
@@ -68,7 +68,8 @@
rpmfi fi = csa->cpioList;
const char *failedFile = NULL;
FD_t cfd;
- int rc, ec;
+ rpmRC rc = RPMRC_OK;
+ int xx;
/*@-boundsread@*/
{ const char *fmode = rpmExpand(fmodeMacro, NULL);
@@ -82,13 +83,15 @@
}
/*@=boundsread@*/
if (cfd == NULL)
- return 1;
+ return RPMRC_FAIL;
- rc = fsmSetup(fi->fsm, FSM_PKGBUILD, payload_format, ts, fi, cfd,
+ xx = fsmSetup(fi->fsm, FSM_PKGBUILD, payload_format, ts, fi, cfd,
&csa->cpioArchiveSize, &failedFile);
+ if (xx)
+ rc = RPMRC_FAIL;
(void) Fclose(cfd);
- ec = fsmTeardown(fi->fsm);
- if (!rc) rc = ec;
+ xx = fsmTeardown(fi->fsm);
+ if (rc == RPMRC_OK && xx) rc = RPMRC_FAIL;
if (rc) {
if (failedFile)
@@ -97,7 +100,7 @@
else
rpmlog(RPMLOG_ERR, _("create archive failed: %s\n"),
cpioStrerror(rc));
- rc = 1;
+ rc = RPMRC_FAIL;
}
failedFile = _free(failedFile);
@@ -108,7 +111,7 @@
/**
*/
-static int cpio_copy(FD_t fdo, CSA_t csa)
+static rpmRC cpio_copy(FD_t fdo, CSA_t csa)
/*@globals fileSystem, internalState @*/
/*@modifies fdo, csa, fileSystem, internalState @*/
{
@@ -119,16 +122,16 @@
if (Fwrite(buf, sizeof(buf[0]), nb, fdo) != nb) {
rpmlog(RPMLOG_ERR, _("cpio_copy write failed: %s\n"),
Fstrerror(fdo));
- return 1;
+ return RPMRC_FAIL;
}
csa->cpioArchiveSize += nb;
}
if (Ferror(csa->cpioFdIn)) {
rpmlog(RPMLOG_ERR, _("cpio_copy read failed: %s\n"),
Fstrerror(csa->cpioFdIn));
- return 1;
+ return RPMRC_FAIL;
}
- return 0;
+ return RPMRC_OK;
}
/**
@@ -591,7 +594,7 @@
}
/*@-boundswrite@*/
-int writeRPM(Header *hdrp, unsigned char ** pkgidp, const char *fileName,
+rpmRC writeRPM(Header *hdrp, unsigned char ** pkgidp, const char *fileName,
CSA_t csa, char *passPhrase, const char **cookie)
{
HGE_t hge = headerGetExtension;
@@ -611,7 +614,7 @@
Header sigh = NULL;
int addsig = 0;
int isSource;
- int rc = 0;
+ rpmRC rc = RPMRC_OK;
int xx;
/* Transfer header reference form *hdrp to h. */
@@ -724,8 +727,8 @@
fdInitDigest(fd, PGPHASHALGO_SHA1, 0);
if (headerWrite(fd, h)) {
- rc = RPMRC_FAIL;
rpmlog(RPMLOG_ERR, _("Unable to write temp header\n"));
+ rc = RPMRC_FAIL;
} else { /* Write the archive and get the size */
(void) Fflush(fd);
fdFiniDigest(fd, PGPHASHALGO_SHA1, &SHA1, NULL, 1);
@@ -740,16 +743,13 @@
rpmio_flags = _free(rpmio_flags);
payload_format = _free(payload_format);
- if (rc)
+ if (rc != RPMRC_OK)
goto exit;
(void) Fclose(fd);
fd = NULL;
(void) Unlink(fileName);
- if (rc)
- goto exit;
-
/* Generate the signature */
(void) fflush(stdout);
sigh = headerNew();
@@ -802,23 +802,22 @@
if (!_nolead) {
const char item[] = "Lead";
size_t nl = rpmpkgSizeof(item, NULL);
- rpmRC _rc;
if (nl == 0)
- _rc = RPMRC_FAIL;
+ rc = RPMRC_FAIL;
else {
void * l = memset(alloca(nl), 0, nl);
const char * msg = buf;
const char *N, *V, *R;
(void) headerNEVRA(h, &N, NULL, &V, &R, NULL);
sprintf(buf, "%s-%s-%s", N, V, R);
- _rc = rpmpkgWrite(item, fd, l, &msg);
+ rc = rpmpkgWrite(item, fd, l, &msg);
}
- if (_rc != RPMRC_OK) {
- rc = RPMRC_FAIL;
+ if (rc != RPMRC_OK) {
rpmlog(RPMLOG_ERR, _("Unable to write package: %s\n"),
Fstrerror(fd));
+ rc = RPMRC_FAIL;
goto exit;
}
}
@@ -826,10 +825,9 @@
/* Write the signature section into the package. */
if (!_nosigh) {
const char item[] = "Signature";
- rpmRC _rc;
- _rc = rpmpkgWrite(item, fd, sigh, NULL);
- if (_rc != RPMRC_OK) {
+ rc = rpmpkgWrite(item, fd, sigh, NULL);
+ if (rc != RPMRC_OK) {
rc = RPMRC_FAIL;
goto exit;
}
@@ -838,9 +836,9 @@
/* Append the header and archive */
ifd = Fopen(sigtarget, "r.fdio");
if (ifd == NULL || Ferror(ifd)) {
- rc = RPMERR_READ;
rpmlog(RPMLOG_ERR, _("Unable to open sigtarget %s: %s\n"),
sigtarget, Fstrerror(ifd));
+ rc = RPMRC_FAIL;
goto exit;
}
@@ -849,9 +847,9 @@
{ Header nh = headerRead(ifd);
if (nh == NULL) {
- rc = RPMERR_READ;
rpmlog(RPMLOG_ERR, _("Unable to read header from %s: %s\n"),
sigtarget, Fstrerror(ifd));
+ rc = RPMRC_FAIL;
goto exit;
}
@@ -859,13 +857,13 @@
(void) headerMergeLegacySigs(nh, sigh);
#endif
- rc = headerWrite(fd, nh);
+ xx = headerWrite(fd, nh);
nh = headerFree(nh);
- if (rc) {
- rc = RPMRC_FAIL;
+ if (xx) {
rpmlog(RPMLOG_ERR, _("Unable to write header to %s: %s\n"),
fileName, Fstrerror(fd));
+ rc = RPMRC_FAIL;
goto exit;
}
}
@@ -885,7 +883,7 @@
goto exit;
}
}
- rc = 0;
+ rc = RPMRC_OK;
exit:
SHA1 = _free(SHA1);
@@ -914,7 +912,7 @@
sigtarget = _free(sigtarget);
}
- if (rc == 0)
+ if (rc == RPMRC_OK)
rpmlog(RPMLOG_NOTICE, _("Wrote: %s\n"), fileName);
else
(void) Unlink(fileName);
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/rpmbuild.h
============================================================================
$ cvs diff -u -r2.75 -r2.76 rpmbuild.h
--- rpm/build/rpmbuild.h 9 Nov 2007 22:02:19 -0000 2.75
+++ rpm/build/rpmbuild.h 19 Nov 2007 17:07:46 -0000 2.76
@@ -359,9 +359,9 @@
* @param name name of scriptlet section
* @param sb lines that compose script body
* @param test don't execute scripts or package if testing
- * @return 0 on success, RPMERR_SCRIPT on failure
+ * @return RPMRC_OK on success, RPMRC_FAIL on failure
*/
-int doScript(Spec spec, int what, /*@null@*/ const char * name,
+rpmRC doScript(Spec spec, int what, /*@null@*/ const char * name,
/*@null@*/ StringBuf sb, int test)
/*@globals rpmGlobalMacroContext, h_errno,
fileSystem, internalState @*/
@@ -519,9 +519,9 @@
* @param spec spec file control structure
* @param what bit(s) to enable stages of build
* @param test don't execute scripts or package if testing
- * @return 0 on success
+ * @return RPMRC_OK on success
*/
-int buildSpec(rpmts ts, Spec spec, int what, int test)
+rpmRC buildSpec(rpmts ts, Spec spec, int what, int test)
/*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
/*@modifies spec->sourceHeader, spec->sourceCpioList, spec->cookie,
spec->sourceRpmName, spec->sourcePkgId,
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/cpio.c
============================================================================
$ cvs diff -u -r2.135 -r2.136 cpio.c
--- rpm/lib/cpio.c 9 Nov 2007 23:36:53 -0000 2.135
+++ rpm/lib/cpio.c 19 Nov 2007 17:07:47 -0000 2.136
@@ -15,7 +15,6 @@
#include "cpio.h"
#include "fsm.h"
-#include "rpmerr.h"
#include "debug.h"
/*@access FSM_t @*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/fsm.c
============================================================================
$ cvs diff -u -r2.133 -r2.134 fsm.c
--- rpm/lib/fsm.c 3 Nov 2007 23:44:00 -0000 2.133
+++ rpm/lib/fsm.c 19 Nov 2007 17:07:47 -0000 2.134
@@ -14,8 +14,6 @@
#include "fsm.h"
#define fsmUNSAFE fsmStage
-#include "rpmerr.h"
-
#define _RPMFI_INTERNAL
#include "rpmfi.h"
#include "rpmte.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmfc.c
============================================================================
$ cvs diff -u -r1.36 -r1.37 rpmfc.c
--- rpm/lib/rpmfc.c 15 Nov 2007 20:26:04 -0000 1.36
+++ rpm/lib/rpmfc.c 19 Nov 2007 17:07:47 -0000 1.37
@@ -98,7 +98,7 @@
/* XXX this error message is probably not seen. */
rpmlog(RPMLOG_ERR, _("Couldn't exec %s: %s\n"),
argv[0], strerror(errno));
- _exit(RPMERR_EXEC);
+ _exit(EXIT_FAILURE);
}
if (child < 0) {
rpmlog(RPMLOG_ERR, _("Couldn't fork %s: %s\n"),
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmlib.h
============================================================================
$ cvs diff -u -r2.446 -r2.447 rpmlib.h
--- rpm/lib/rpmlib.h 14 Nov 2007 01:17:51 -0000 2.446
+++ rpm/lib/rpmlib.h 19 Nov 2007 17:07:47 -0000 2.447
@@ -9,7 +9,6 @@
*/
#include "rpmmessages.h"
-#include "rpmerr.h"
#include <rpmtag.h>
#include "popt.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/tar.c
============================================================================
$ cvs diff -u -r1.5 -r1.6 tar.c
--- rpm/lib/tar.c 12 Nov 2007 10:43:21 -0000 1.5
+++ rpm/lib/tar.c 19 Nov 2007 17:07:47 -0000 1.6
@@ -12,7 +12,6 @@
#include "fsm.h"
#include "ugid.h"
-#include "rpmerr.h"
#include "debug.h"
/*@access FSM_t @*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmconstant/rpmh2tbl
============================================================================
$ cvs diff -u -r1.5 -r1.6 rpmh2tbl
--- rpm/rpmconstant/rpmh2tbl 4 Aug 2007 12:20:09 -0000 1.5
+++ rpm/rpmconstant/rpmh2tbl 19 Nov 2007 17:07:47 -0000 1.6
@@ -15,7 +15,7 @@
##- along with this program; if not, write to the Free Software
##- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-# $Id: rpmh2tbl,v 1.5 2007/08/04 12:20:09 nanardon Exp $
+# $Id: rpmh2tbl,v 1.6 2007/11/19 17:07:47 jbj Exp $
my @availlabletables;
@@ -65,9 +65,6 @@
'^(RPMBUILD_[\w_]+)' => 'rpmBuildFlags',
'^(PART_[\w_]+)' => 'rpmParseState',
},
- 'rpmerr.h' => {
- '^(RPMERR_[\w_]+)' => 'rpmerrCode',
- },
'rpmmacro.h' => {
'^(RMIL_[\w_]+)' => 'rpmMacrosContext',
},
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/signature.c
============================================================================
$ cvs diff -u -r1.27 -r1.28 signature.c
--- rpm/rpmdb/signature.c 17 Nov 2007 17:57:39 -0000 1.27
+++ rpm/rpmdb/signature.c 19 Nov 2007 17:07:48 -0000 1.28
@@ -185,7 +185,7 @@
rpmlog(RPMLOG_ERR, _("Could not exec %s: %s\n"), "gpg",
strerror(errno));
- _exit(RPMERR_EXEC);
+ _exit(EXIT_FAILURE);
}
delMacro(NULL, "__plaintext_filename");
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
============================================================================
$ cvs diff -u -r1.107 -r1.108 Makefile.am
--- rpm/rpmio/Makefile.am 11 Nov 2007 15:05:19 -0000 1.107
+++ rpm/rpmio/Makefile.am 19 Nov 2007 17:07:48 -0000 1.108
@@ -34,7 +34,7 @@
pkginc_HEADERS = \
argv.h envvar.h fts.h mire.h rpmdav.h rpmhash.h \
rpmio-stub.h rpmmg.h \
- rpmio.h rpmurl.h rpmmacro.h rpmlog.h rpmmessages.h rpmerr.h rpmpgp.h \
+ rpmio.h rpmurl.h rpmmacro.h rpmlog.h rpmmessages.h rpmpgp.h \
rpmsq.h rpmsw.h ugid.h
noinst_HEADERS = \
md2.h md4.h rmd128.h rmd160.h rmd256.h rmd320.h sha224.h \
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/macro.c
============================================================================
$ cvs diff -u -r2.152 -r2.153 macro.c
--- rpm/rpmio/macro.c 15 Nov 2007 17:27:59 -0000 2.152
+++ rpm/rpmio/macro.c 19 Nov 2007 17:07:48 -0000 2.153
@@ -60,7 +60,6 @@
#include <rpmio_internal.h>
#include <rpmmessages.h>
-#include <rpmerr.h>
#ifdef WITH_LUA
#include <rpmlua.h>
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/mire.c
============================================================================
$ cvs diff -u -r1.7 -r1.8 mire.c
--- rpm/rpmio/mire.c 11 Oct 2007 19:14:41 -0000 1.7
+++ rpm/rpmio/mire.c 19 Nov 2007 17:07:48 -0000 1.8
@@ -3,7 +3,7 @@
*/
#include "system.h"
-#include <rpmerr.h>
+#include <rpmlog.h>
#define _MIRE_INTERNAL
#include <mire.h>
@@ .
rm -f rpm/rpmio/rpmerr.h <<'@@ .'
Index: rpm/rpmio/rpmerr.h
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmlua.c
============================================================================
$ cvs diff -u -r2.27 -r2.28 rpmlua.c
--- rpm/rpmio/rpmlua.c 15 Nov 2007 17:27:59 -0000 2.27
+++ rpm/rpmio/rpmlua.c 19 Nov 2007 17:07:48 -0000 2.28
@@ -4,7 +4,7 @@
#ifdef WITH_LUA
#include <rpmio.h>
#include <rpmmacro.h>
-#include <rpmerr.h>
+#include <rpmlog.h>
#include <rpmurl.h>
#include <rpmurl.h>
#include <rpmhook.h>
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmmg.c
============================================================================
$ cvs diff -u -r2.5 -r2.6 rpmmg.c
--- rpm/rpmio/rpmmg.c 12 Nov 2007 13:07:56 -0000 2.5
+++ rpm/rpmio/rpmmg.c 19 Nov 2007 17:07:48 -0000 2.6
@@ -9,7 +9,7 @@
#endif
#include <rpmio.h>
-#include <rpmerr.h>
+#include <rpmlog.h>
#define _RPMMG_INTERNAL
#include <rpmmg.h>
@@ .
Received on Mon Nov 19 18:07:48 2007