RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: lua/local/ llocal.lua

From: Ralf S. Engelschall <rse@rpm5.org>
Date: Fri 11 Jan 2008 - 19:58:16 CET
Message-Id: <20080111185816.E078F348460@rpm5.org>
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs                       Email:  rse@rpm5.org
  Module: lua                              Date:   11-Jan-2008 19:58:16
  Branch: HEAD                             Handle: 2008011118581600

  Modified files:
    lua/local               llocal.lua

  Log:
    fix multi-line parsing and reduce all whitespaces even on multi-line
    data

  Summary:
    Revision    Changes     Path
    1.11        +2  -2      lua/local/llocal.lua
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: lua/local/llocal.lua
  ============================================================================
  $ cvs diff -u -r1.10 -r1.11 llocal.lua
  --- lua/local/llocal.lua	2 Jan 2008 16:57:37 -0000	1.10
  +++ lua/local/llocal.lua	11 Jan 2008 18:58:16 -0000	1.11
  @@ -283,11 +283,11 @@
           "(?s)" ..
           "([A-Za-z0-9][A-Za-z0-9-]*):[ \\t]*" ..
           "([^\\r\\n]*" ..
  -        "(?:\\r?\\n[ \\t]+[^\\r\\n]+)*" ..
  +        "(?:\\r?\\n(?:[ \\t]*|[ \\t]+[^\\r\\n]+))*" ..
           ")\\r?\\n",
           function (m)
               local key = m[1]
  -            local value = util.rsubst(m[2], "^[ \\t]*(?:\\r?\\n)?(.*?)[ \\t]*$", "$1")
  +            local value = util.rsubst(m[2], "(?s)^\\s*(.*?)\\s*$", "$1")
               cfg[key] = value
           end
       )
  @@ .
Received on Fri Jan 11 19:58:16 2008
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.