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:   15-Jul-2007 04:10:00
  Branch: HEAD                             Handle: 2007071503095901

  Modified files:
    rpm                     CHANGES
    rpm/lib                 psm.c

  Log:
    - don't close stdout by mistake (OpenSuSE).

  Summary:
    Revision    Changes     Path
    1.1465      +1  -0      rpm/CHANGES
    2.205       +1  -6      rpm/lib/psm.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1464 -r1.1465 CHANGES
  --- rpm/CHANGES	15 Jul 2007 01:55:18 -0000	1.1464
  +++ rpm/CHANGES	15 Jul 2007 02:09:59 -0000	1.1465
  @@ -1,4 +1,5 @@
   4.5 -> 5.0:
  +    - jbj: don't close stdout by mistake (OpenSuSE).
       - jbj: run checkfiles even if failure is imminent (OpenSuSE).
       - jbj: rip compiled in %patch, breaking remote patch fetching.
       - jbj: fixup %patchNN rewrite.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/psm.c
  ============================================================================
  $ cvs diff -u -r2.204 -r2.205 psm.c
  --- rpm/lib/psm.c	10 Jul 2007 18:25:15 -0000	2.204
  +++ rpm/lib/psm.c	15 Jul 2007 02:10:00 -0000	2.205
  @@ -823,13 +823,8 @@
   	    /* make sure we don't close stdin/stderr/stdout by mistake! */
   	    if (ofdno > STDERR_FILENO && ofdno != sfdno)
   		xx = Fclose (out);
  -	    if (sfdno > STDERR_FILENO)
  +	    if (sfdno > STDERR_FILENO && ofdno != sfdno)
   		xx = Fclose (scriptFd);
  -	    else {
  -/*@-usereleased@*/
  -		xx = Fclose(out);
  -/*@=usereleased@*/
  -	    }
   	}
   
   	{   const char *ipath = rpmExpand("PATH=%{_install_script_path}", NULL);
  @@ .