RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Arkadiusz Miskiewicz
  Root:   /v/rpm/cvs                       Email:  [EMAIL PROTECTED]
  Module: rpm                              Date:   29-Jul-2008 17:42:49
  Branch: HEAD                             Handle: 2008072915424900

  Modified files:
    rpm                     macros.in

  Log:
    Protect against weird values on env: LC_ALL, LINGUAS, LANGUAGE.

  Summary:
    Revision    Changes     Path
    1.251       +6  -1      rpm/macros.in
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/macros.in
  ============================================================================
  $ cvs diff -u -r1.250 -r1.251 macros.in
  --- rpm/macros.in     20 Jul 2008 00:04:51 -0000      1.250
  +++ rpm/macros.in     29 Jul 2008 15:42:49 -0000      1.251
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.250 2008/07/20 00:04:51 jbj Exp $
  +# $Id: macros.in,v 1.251 2008/07/29 15:42:49 arekm Exp $
   #
   # This is a global RPM configuration file. All changes made here will
   # be lost when the rpm package is upgraded. Any per-system configuration
  @@ -1115,9 +1115,14 @@
     %{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\
     export CLASSPATH}\
     unset PERL_MM_OPT || :\
  +  LC_ALL=C\
  +  export LC_ALL\
     LANG=C\
     export LANG\
     unset DISPLAY || :\
  +  unset LINGUAS || :\
  +  unset LANGUAGE || :\
  +  unset LC_MESSAGES || :\
     \
     %{verbose:set -x}%{!verbose:exec > /dev/null}\
     umask 022\
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org

Reply via email to