ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'remove_local_zm_conf_override' into storageareas

This commit is contained in:
Isaac Connor 2016-04-04 16:13:44 -04:00
parent 6c92c0e3f7 a31660c1f6
commit dd7f399959
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
View File

@ -66,12 +66,6 @@ use Carp;
BEGIN BEGIN
{ {
my $config_file = ZM_CONFIG; my $config_file = ZM_CONFIG;
( my $local_config_file = $config_file ) =~ s|^.*/|./|;
if ( -s $local_config_file and -r $local_config_file )
{
print( STDERR "Warning, overriding installed $local_config_file file with local copy\n" );
$config_file = $local_config_file;
}
open( my $CONFIG, "<", $config_file ) open( my $CONFIG, "<", $config_file )
or croak( "Can't open config file '$config_file': $!" ); or croak( "Can't open config file '$config_file': $!" );
foreach my $str ( <$CONFIG> ) foreach my $str ( <$CONFIG> )