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

ALlow micro version mismatches to not be fatal. Minor and Major are still fatal.

This commit is contained in:
Isaac Connor 2021-02-03 09:50:37 -05:00
parent 8a99665311
commit e085acedc8
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/zmpkg.pl.in
View File

@ -171,12 +171,21 @@ if ( $command =~ /^(?:start|restart)$/ ) {
if ( $Config{ZM_DYN_DB_VERSION}
and ( $Config{ZM_DYN_DB_VERSION} ne ZM_VERSION )
) {
my ( $db_major, $db_minor, $db_micro ) = split('.', $Config{ZM_DYN_DB_VERSION});
my ( $major, $minor, $micro ) = split('.', ZM_VERSION);
if ( $db_major != $major or $db_minor != $minor ) {
Fatal('Version mismatch, system is version '.ZM_VERSION
.', database is '.$Config{ZM_DYN_DB_VERSION}
.', please run zmupdate.pl to update.'
);
exit(-1);
} else {
Error('Version mismatch, system is version '.ZM_VERSION
.', database is '.$Config{ZM_DYN_DB_VERSION}
.', please run zmupdate.pl to update.'
);
}
} # end if version mismatch
# Recreate the temporary directory if it's been wiped
verifyFolder('@ZM_TMPDIR@');