RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm/ CHANGES rpm/python/ header-py.c

From: Jeff Johnson <jbj@rpm5.org>
Date: Thu 24 Jan 2008 - 20:21:47 CET
Message-Id: <20080124192147.AA22D348466@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:   24-Jan-2008 20:21:47
  Branch: HEAD                             Handle: 2008012419214700

  Modified files:
    rpm                     CHANGES
    rpm/python              header-py.c

  Log:
    - mej: catch EOF returned as RPMRC_NOTFOUND correctly.

  Summary:
    Revision    Changes     Path
    1.2089      +1  -0      rpm/CHANGES
    1.90        +1  -1      rpm/python/header-py.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2088 -r1.2089 CHANGES
  --- rpm/CHANGES	24 Jan 2008 08:35:18 -0000	1.2088
  +++ rpm/CHANGES	24 Jan 2008 19:21:47 -0000	1.2089
  @@ -1,4 +1,5 @@
   5.0.0 -> 5.1a1:
  +    - mej: catch EOF returned as RPMRC_NOTFOUND correctly.
       - rse: add support for QNX by adjusting to its 3-parameter based makedev(2)
       - jbj: resurrect rpm.spec.in.
       - jbj: fix: permit %{lua:...} to recurse.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/python/header-py.c
  ============================================================================
  $ cvs diff -u -r1.89 -r1.90 header-py.c
  --- rpm/python/header-py.c	4 Dec 2007 22:53:54 -0000	1.89
  +++ rpm/python/header-py.c	24 Jan 2008 19:21:47 -0000	1.90
  @@ -701,7 +701,7 @@
   	{   const char item[] = "Header";
   	    const char * msg = NULL;
   	    rpmRC rc = rpmpkgRead(item, fd, &h, &msg);
  -	    if (rc != RPMRC_OK)
  +	    if (rc != RPMRC_OK && rc != RPMRC_NOTFOUND)
   		rpmlog(RPMLOG_ERR, "%s: %s: %s\n", "rpmpkgRead", item, msg);
   	    msg = _free(msg);
   	}
  @@ .
Received on Thu Jan 24 20:21:47 2008
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.