RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 19-Aug-2008 16:46:28
Branch: HEAD Handle: 2008081914462701
Modified files:
rpm CHANGES
rpm/lib rpmrc.c
Log:
- jbj: display sysinfo path with --showrc.
Summary:
Revision Changes Path
1.2529 +1 -0 rpm/CHANGES
2.245 +2 -1 rpm/lib/rpmrc.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2528 -r1.2529 CHANGES
--- rpm/CHANGES 18 Aug 2008 23:29:27 -0000 1.2528
+++ rpm/CHANGES 19 Aug 2008 14:46:27 -0000 1.2529
@@ -1,5 +1,6 @@
5.1.0 -> 5.2a0:
+ - jbj: display sysinfo path with --showrc.
- jbj: remove internal zlib.
- jbj: WR: eliminate most compiler warnings.
- jbj: WR: eliminate duplicated AutoFu boilerplate, use system.h instead.
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmrc.c
============================================================================
$ cvs diff -u -r2.244 -r2.245 rpmrc.c
--- rpm/lib/rpmrc.c 17 Aug 2008 20:43:58 -0000 2.244
+++ rpm/lib/rpmrc.c 19 Aug 2008 14:46:28 -0000 2.245
@@ -1016,7 +1016,8 @@
xx = rpmdsSysinfo(PRCO, NULL);
ds = rpmdsFromPRCO(PRCO, RPMTAG_PROVIDENAME);
if (ds != NULL) {
- fprintf(fp, _("Configured system provides (from
/etc/rpm/sysinfo):\n"));
+ const char * fn = (_sysinfo_path ? _sysinfo_path :
"/etc/rpm/sysinfo");
+ fprintf(fp, _("Configured system provides (from %s):\n"), fn);
ds = rpmdsInit(ds);
while (rpmdsNext(ds) >= 0) {
const char * DNEVR = rpmdsDNEVR(ds);
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
