RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm/scripts/ rpm2cpio

From: Anders F. Björklund <afb@rpm5.org>
Date: Tue 13 Nov 2007 - 22:29:53 CET
Message-Id: <20071113212953.33C27348473@rpm5.org>
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Anders F. Björklund
  Root:   /v/rpm/cvs                       Email:  afb@rpm5.org
  Module: rpm                              Date:   13-Nov-2007 22:29:53
  Branch: HEAD                             Handle: 2007111321295300

  Modified files:
    rpm/scripts             rpm2cpio

  Log:
    prefer new LZMA Utils 4.32, over old LZMA Utils 4.27

  Summary:
    Revision    Changes     Path
    1.4         +10 -1      rpm/scripts/rpm2cpio
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/scripts/rpm2cpio
  ============================================================================
  $ cvs diff -u -r1.3 -r1.4 rpm2cpio
  --- rpm/scripts/rpm2cpio	12 Oct 2007 19:50:37 -0000	1.3
  +++ rpm/scripts/rpm2cpio	13 Nov 2007 21:29:53 -0000	1.4
  @@ -33,7 +33,16 @@
   else
   	# Most versions of file don't support LZMA, therefore we assume
   	# anything not detected is LZMA
  -	DECOMPRESSOR="lzmash -d -c"
  +	DECOMPRESSOR=`which unlzma 2>/dev/null`
  +	case "$DECOMPRESSOR" in
  +	    /* ) ;;
  +	    *  ) DECOMPRESSOR=`which lzmash 2>/dev/null`
  +	         case "$DECOMPRESSOR" in
  +	             /* ) DECOMPRESSOR="lzmash -d -c" ;;
  +	             *  ) DECOMPRESSOR=cat ;;
  +	         esac
  +	         ;;
  +	esac
   fi
   
   dd if=$pkg ibs=$o skip=1 2>/dev/null | $DECOMPRESSOR
  @@ .
Received on Tue Nov 13 22:29:53 2007
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.