RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm-4_5: rpm/rpmio/ rpmio.c

From: Per Øyvind Karlsen <pkarlsen@rpm5.org>
Date: Sun 09 Dec 2007 - 04:42:27 CET
Message-Id: <20071209034227.87BD1348457@rpm5.org>
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs                       Email:  pkarlsen@rpm5.org
  Module: rpm                              Date:   09-Dec-2007 04:42:27
  Branch: rpm-4_5                          Handle: 2007120903422700

  Modified files:           (Branch: rpm-4_5)
    rpm/rpmio               rpmio.c

  Log:
    use LZMA_Alone file format, even with newer versions (backport from
    5.0)

  Summary:
    Revision    Changes     Path
    1.79.2.6    +4  -1      rpm/rpmio/rpmio.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmio.c
  ============================================================================
  $ cvs diff -u -r1.79.2.5 -r1.79.2.6 rpmio.c
  --- rpm/rpmio/rpmio.c	6 Dec 2007 22:58:17 -0000	1.79.2.5
  +++ rpm/rpmio/rpmio.c	9 Dec 2007 03:42:27 -0000	1.79.2.6
  @@ -2824,6 +2824,9 @@
       const char *lzma;
       char l[3];
       const char *level;
  +
  +    /* revisit use of LZMA_Alone, when lzdRead supports new LZMA Utils */
  +    char *env[] = { "LZMA_OPT=--format=alone", NULL };
       
       if (isdigit(mode[1])) /* "w5" */
       {
  @@ -2869,7 +2872,7 @@
           for (i = 3; i < 1024; i++)
   	    xx = close(i);
   	lzma = rpmGetPath("%{?__lzma}%{!?__lzma:/usr/bin/lzma}", NULL);
  -	if (execl(lzma, "lzma", level, NULL))
  +	if (execle(lzma, "lzma", level, NULL, env))
               _exit(1);
   	lzma = _free(lzma);
       }
  @@ .
Received on Sun Dec 9 04:42:27 2007
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.