Backport #1372
This commit is contained in:
parent
560086472d
commit
79f64c8270
|
@ -46,7 +46,7 @@ Log : $conf->{cfgLog}
|
||||||
|
|
||||||
sub updateCache {
|
sub updateCache {
|
||||||
my $self = shift;
|
my $self = shift;
|
||||||
my $conf = $self->confAccess->getConf( { noCache => 1, raw => 1 } );
|
my $conf = $self->confAccess->getConf( { noCache => 2 } );
|
||||||
die "Must not be launched as root" unless ($>);
|
die "Must not be launched as root" unless ($>);
|
||||||
print STDERR
|
print STDERR
|
||||||
qq{Cache updated to configuration $conf->{cfgNum} for user $>\n};
|
qq{Cache updated to configuration $conf->{cfgNum} for user $>\n};
|
||||||
|
|
|
@ -200,7 +200,7 @@ sub getConf {
|
||||||
# Store modified configuration in cache
|
# Store modified configuration in cache
|
||||||
$self->setLocalConf($r)
|
$self->setLocalConf($r)
|
||||||
if ( $self->{refLocalStorage}
|
if ( $self->{refLocalStorage}
|
||||||
and not( $args->{noCache} or $args->{raw} ) );
|
and not( $args->{noCache} == 1 or $args->{raw} ) );
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user