RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm/ CHANGES rpm/rpmio/ macro.c

From: Jeff Johnson <jbj@rpm5.org>
Date: Fri 28 Dec 2007 - 02:37:35 CET
Message-Id: <20071228013735.A32BD34845C@rpm5.org>
  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:   28-Dec-2007 02:37:35
  Branch: HEAD                             Handle: 2007122801373500

  Modified files:
    rpm                     CHANGES
    rpm/rpmio               macro.c

  Log:
    - use "\n", not ",", as the default for %@foo expansion.

  Summary:
    Revision    Changes     Path
    1.2027      +1  -0      rpm/CHANGES
    2.164       +1  -1      rpm/rpmio/macro.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2026 -r1.2027 CHANGES
  --- rpm/CHANGES	28 Dec 2007 01:20:13 -0000	1.2026
  +++ rpm/CHANGES	28 Dec 2007 01:37:35 -0000	1.2027
  @@ -1,4 +1,5 @@
   5.0b3 -> 5.0b4:
  +    - jbj: use "\n", not ",", as the default for %@foo expansion.
       - jbj: fixup %{@foo:, } per rse comments.
       - jbj: convert %{@foo:|} to "foo|bar|quux" tuple. %@foo assumes CSV comma.
       - rse: implement "rpm --undefine <macro>" as the counterpart to "rpm --define '<macro> <value>'"
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/macro.c
  ============================================================================
  $ cvs diff -u -r2.163 -r2.164 macro.c
  --- rpm/rpmio/macro.c	28 Dec 2007 01:20:13 -0000	2.163
  +++ rpm/rpmio/macro.c	28 Dec 2007 01:37:35 -0000	2.164
  @@ -1688,7 +1688,7 @@
   	/* XXX Special processing to create a tuple from stack'd values. */
   	if (stackarray) {
   		if (!(g && g < ge)) {
  -			g = ",";
  +			g = "\n";
   			gn = strlen(g);
   		}
   		rc = expandFIFO(mb, me, g, gn);
  @@ .
Received on Fri Dec 28 02:37:35 2007
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.