Workaround for #1655

This commit is contained in:
Xavier Guimard 2019-06-12 09:55:06 +02:00
parent eef82808a2
commit ee95ac786f
2 changed files with 5 additions and 2 deletions

View File

@ -446,7 +446,8 @@ start_web_server: all prepare_test_server
@if test "$(TESTBACKEND)" = "DBI"; then \
echo 'create table lmConfig (cfgNum int, data text);'|sqlite3 e2e-tests/conf/config.db; \
echo 'create table sessions (id text, a_session text, LastUpdated int);'|sqlite3 e2e-tests/conf/sessions.db; \
perl --current=e2e-tests/conf/lemonldap-ng.ini \
perl lemonldap-ng-common/scripts/convertConfig \
--current=e2e-tests/conf/lemonldap-ng.ini \
--new=e2e-tests/conf/lemonldap-ng-sql.ini; \
mv e2e-tests/conf/lemonldap-ng-sql.ini e2e-tests/conf/lemonldap-ng.ini; \
LLNG_DEFAULTCONFFILE=e2e-tests/conf/lemonldap-ng.ini \

View File

@ -146,7 +146,9 @@ sub purge {
$self->logger->warn("Bad reference $myref");
return 0;
}
unless ( $d =~ s/^(\d{4})(\d{2})(\d{2}).*$/$1-$2-$3/ ) {
unless ( $d =~ s/^(\d{4})(\d{2})(\d{2}).*$/$1-$2-$3/
or $d =~ s/^(\d{4}-\d{2}-\d{2}).*$/$1/ )
{
$self->logger->warn("Bad date $d");
return 0;
}