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

  Server: cvs.openpkg.org                  Name:   Michael van Elst
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   10-Jan-2003 22:47:27
  Branch: HEAD                             Handle: 2003011021472600

  Modified files:
    openpkg-src/openpkg-tool
                            openpkg-build.pl

  Log:
    accept all options in rc file

  Summary:
    Revision    Changes     Path
    1.30        +5  -2      openpkg-src/openpkg-tool/openpkg-build.pl
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg-tool/openpkg-build.pl
  ============================================================================
  $ cvs diff -u -r1.29 -r1.30 openpkg-build.pl
  --- openpkg-src/openpkg-tool/openpkg-build.pl 10 Jan 2003 14:16:22 -0000      1.29
  +++ openpkg-src/openpkg-tool/openpkg-build.pl 10 Jan 2003 21:47:26 -0000      1.30
  @@ -30,7 +30,8 @@
   
   use strict;
   use vars qw/$opt_R $opt_r $opt_f $opt_u $opt_U $opt_a $opt_A $opt_z $opt_Z $opt_P 
$opt_N $opt_E $opt_i $opt_D $opt_p $opt_q $opt_s $opt_S $opt_X/;
  -getopts('R:r:f:uUaAzZP:N:E:iD:p:qsSX');
  +my $getopts = 'R:r:f:uUaAzZP:N:E:iD:p:qsSX';
  +getopts($getopts);
   
   ##########################################################################
   
  @@ -89,11 +90,13 @@
   my(%env) = ( '' => { } );
   if (open(FH, "< $ENV{'HOME'}/.openpkg/build")) {
       my($env) = $env{''};
  +    my($go) = $getopts;
  +    $go =~ s/[^a-zA-Z]//g;
       while (<FH>) {
           if (/^\s*\[([^\]]*)\]/) {
               $env{$1} = { } unless $env{$1};
               $env = $env{$1};
  -        } elsif (my($opt,$val) = /^\-([RfruUaAzPN])\s*(.*?)\s*$/) {
  +        } elsif (my($opt,$val) = /^\-([$go])\s*(.*?)\s*$/) {
               $val = 1 unless defined $val;
               $env->{$opt} = $val;
           }
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to