RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm/lib/ rpmds.c rpmrc.c

From: Ralf S. Engelschall <rse@rpm5.org>
Date: Mon 02 Jul 2007 - 10:53:29 CEST
Message-Id: <20070702085329.9270C3484EA@rpm5.org>
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs                       Email:  rse@rpm5.org
  Module: rpm                              Date:   02-Jul-2007 10:53:29
  Branch: HEAD                             Handle: 2007070209532900

  Modified files:
    rpm/lib                 rpmds.c rpmrc.c

  Log:
    do not hard-code the config directory /etc/rpm, use the existing
    SYSCONFIGDIR #define which especially can be configured to a different
    directory during build-time, too

  Summary:
    Revision    Changes     Path
    2.59        +1  -1      rpm/lib/rpmds.c
    2.200       +1  -1      rpm/lib/rpmrc.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmds.c
  ============================================================================
  $ cvs diff -u -r2.58 -r2.59 rpmds.c
  --- rpm/lib/rpmds.c	21 Jun 2007 12:00:08 -0000	2.58
  +++ rpm/lib/rpmds.c	2 Jul 2007 08:53:29 -0000	2.59
  @@ -1607,7 +1607,7 @@
       return rc;
   }
   
  -#define	_ETC_RPM_SYSINFO	"/etc/rpm/sysinfo"
  +#define	_ETC_RPM_SYSINFO	SYSCONFIGDIR "/sysinfo"
   /*@unchecked@*/ /*@observer@*/ /*@owned@*/ /*@relnull@*/
   static const char *_sysinfo_path = NULL;
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmrc.c
  ============================================================================
  $ cvs diff -u -r2.199 -r2.200 rpmrc.c
  --- rpm/lib/rpmrc.c	29 Jun 2007 12:28:41 -0000	2.199
  +++ rpm/lib/rpmrc.c	2 Jul 2007 08:53:29 -0000	2.200
  @@ -31,7 +31,7 @@
   static const char * configTarget = NULL;
   
   /*@observer@*/ /*@unchecked@*/
  -static const char * platform = "/etc/rpm/platform";
  +static const char * platform = SYSCONFIGDIR "/platform";
   /*@only@*/ /*@relnull@*/ /*@unchecked@*/
   void * platpat = NULL;
   /*@unchecked@*/
  @@ .
Received on Mon Jul 2 10:53:29 2007
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.