/[pdpsoft]/nl.nikhef.pdp.fetchcrl/trunk/fetch-crl3.pl
ViewVC logotype

Diff of /nl.nikhef.pdp.fetchcrl/trunk/fetch-crl3.pl

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2596 by davidg, Fri Sep 9 12:27:28 2011 UTC revision 2597 by davidg, Wed Jan 30 08:22:08 2013 UTC
# Line 140  sub init_configuration() { Line 140  sub init_configuration() {
140    
141    $configfile ||= ( -e "/etc/fetch-crl.conf" and "/etc/fetch-crl.conf" );    $configfile ||= ( -e "/etc/fetch-crl.conf" and "/etc/fetch-crl.conf" );
142    $configfile ||= ( -e "/etc/fetch-crl.cnf" and "/etc/fetch-crl.cnf" );    $configfile ||= ( -e "/etc/fetch-crl.cnf" and "/etc/fetch-crl.cnf" );
   ($quiet > 0) and $verbosity = -$quiet;  
143    
144    $cnf = ConfigTiny->new();    $cnf = ConfigTiny->new();
145    $configfile and    $configfile and
# Line 171  sub init_configuration() { Line 170  sub init_configuration() {
170    $cnf->{_}->{randomwait}     = $randomwait if defined $randomwait;    $cnf->{_}->{randomwait}     = $randomwait if defined $randomwait;
171    $cnf->{_}->{nosymlinks}     = $nosymlinks if defined $nosymlinks;    $cnf->{_}->{nosymlinks}     = $nosymlinks if defined $nosymlinks;
172    
173      # deal with interaction of verbosity in logfile and quiet option
174      # since a noquiet config option can cancel it
175      if ( not defined $cnf->{_}->{noquiet} ) {
176        if ( $quiet == 1) { $cnf->{_}->{verbosity} = -1; }
177      } else {
178        if ( $quiet >= 2) { $cnf->{_}->{verbosity} = -1; }
179      }
180    
181    # key default values    # key default values
182    defined $cnf->{_}->{version}  or $cnf->{_}->{version}    = "3+";    defined $cnf->{_}->{version}  or $cnf->{_}->{version}    = "3+";
183    defined $cnf->{_}->{packager} or $cnf->{_}->{packager}   = "EUGridPMA";    defined $cnf->{_}->{packager} or $cnf->{_}->{packager}   = "EUGridPMA";
Legend:
Removed from v.2596  
changed lines
  Added in v.2597
grid.support@nikhef.nl
 ViewVC Help
Powered by ViewVC 1.1.28