OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-tools                    Date:   06-Feb-2007 19:50:02
  Branch: HEAD                             Handle: 2007020618500200

  Modified files:
    openpkg-tools/cmd       lint-spec.pl

  Log:
    allow macros to be nested -- at least to one level and with trivial
    macros inside the outer one

  Summary:
    Revision    Changes     Path
    1.15        +2  -1      openpkg-tools/cmd/lint-spec.pl
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-tools/cmd/lint-spec.pl
  ============================================================================
  $ cvs diff -u -r1.14 -r1.15 lint-spec.pl
  --- openpkg-tools/cmd/lint-spec.pl    1 Jan 2007 17:45:11 -0000       1.14
  +++ openpkg-tools/cmd/lint-spec.pl    6 Feb 2007 18:50:02 -0000       1.15
  @@ -695,7 +695,8 @@
   
           #   check for shtool options with no space before argument
           my $subthis = $this;
  -        $subthis =~ s/%{[^}]*?}//sg;
  +        $subthis =~ s/\%{[A-Za-z][A-Za-z0-9_]*}//sg;
  +        $subthis =~ s/\%{[A-Za-z][A-Za-z0-9_]*(?:\s+[^}]+?)?}//sg;
           #   remove content of quoted arguments as they might contain 
unrelated things to catch
           $subthis =~ s/'[^']*'/ARG/sg;
           $subthis =~ s/"[^"]*"/ARG/sg;
  @@ .
______________________________________________________________________
OpenPKG                                             http://openpkg.org
CVS Repository Commit List                     [email protected]

Reply via email to