From 43ba8dc8cb55a20ac0d1a574e84f0f897cfdc5da Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Wed, 22 Sep 2021 12:02:43 +0000 Subject: [PATCH] Bug 29076: Fetch the zebraqueue entries when not confirm This patch remove a check for confirm when fetching the entries for possible deletion from the zebraqueue Without this we die when we try to access the entries for counting To test: 1 - perl misc/cronjobs/cleanup_database.pl --sessions --zebraqueue 10 --list-invites --z3950 --logs 180 --mail 375 -v 2 - Dies 3 - Apply patch 4 - Repeat 1 5 - Success! --- misc/cronjobs/cleanup_database.pl | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/misc/cronjobs/cleanup_database.pl b/misc/cronjobs/cleanup_database.pl index 94a6301620..17b57d79fc 100755 --- a/misc/cronjobs/cleanup_database.pl +++ b/misc/cronjobs/cleanup_database.pl @@ -283,9 +283,7 @@ if ($zebraqueue_days) { WHERE done=1 AND time < date_sub(curdate(), INTERVAL ? DAY) } ); - if ( $confirm ) { - $sth->execute($zebraqueue_days) or die $dbh->errstr; - } + $sth->execute($zebraqueue_days) or die $dbh->errstr; $sth2 = $dbh->prepare(q{ DELETE FROM zebraqueue WHERE id=? }); while ( my $record = $sth->fetchrow_hashref ) { if ( $confirm ) { -- 2.20.1