RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm/ CHANGES rpm/lib/ depends.c

From: Ralf S. Engelschall <rse@rpm5.org>
Date: Fri 28 Dec 2007 - 14:20:22 CET
Message-Id: <20071228132022.ECF4634845C@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:   28-Dec-2007 14:20:22
  Branch: HEAD                             Handle: 2007122813202200

  Modified files:
    rpm                     CHANGES
    rpm/lib                 depends.c

  Log:
    Fix invocaction of GnuPG's gpg(1) command for gnupg(<path>) dependency
    assertions: the options "-qv" would be "--quiet --verbose" and actually
    would lead to an encryption operation.

  Summary:
    Revision    Changes     Path
    1.2031      +1  -0      rpm/CHANGES
    1.374       +1  -1      rpm/lib/depends.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2030 -r1.2031 CHANGES
  --- rpm/CHANGES	28 Dec 2007 11:46:58 -0000	1.2030
  +++ rpm/CHANGES	28 Dec 2007 13:20:22 -0000	1.2031
  @@ -1,4 +1,5 @@
   5.0b3 -> 5.0b4:
  +    - rse: fix invocaction of GnuPG's gpg(1) command for gnupg(<path>) dependency assertions
       - afb: hide the rpmlib Version/Timestamp/Vendor markers spew unless verbose.
       - rse: fix %{@foo} macro stack expansion including also the value at the stack bottom
       - rse: remove the confusing additional --predefine behaviour when --define is used as the first CLI option
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/depends.c
  ============================================================================
  $ cvs diff -u -r1.373 -r1.374 depends.c
  --- rpm/lib/depends.c	26 Dec 2007 10:40:45 -0000	1.373
  +++ rpm/lib/depends.c	28 Dec 2007 13:20:22 -0000	1.374
  @@ -822,7 +822,7 @@
       }
   
       if (NSType == RPMNS_TYPE_GNUPG) {
  -	static const char gnupg_pre[] = "%(%{__gpg} -qv ";
  +	static const char gnupg_pre[] = "%(%{__gpg} --batch --no-tty --quiet --verify ";
   	static const char gnupg_post[] = " 2>/dev/null; echo $?)";
   	const char * t = rpmExpand(gnupg_pre, Name, gnupg_post, NULL);
   
  @@ .
Received on Fri Dec 28 14:20:23 2007
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.