Attachment 113002 Details for Bug 21214 – Bug_21214: Changes after merge

[patch] Bug_21214: Changes after merge

Bug21214-Changes-after-merge.patch (text/plain), 2.10 KB, created by Ivan Dziuba on 2020-11-04 15:00:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Dziuba

Created: 2020-11-04 15:00:01 UTC

Size: 2.10 KB

patch

obsolete

>From 2eef7c13b3733c51208bdc811bae133a94305a7b Mon Sep 17 00:00:00 2001
>From: Ivan Dziuba <ivan.dziuba@inlibro.com>
>Date: Wed, 4 Nov 2020 09:58:09 -0500
>Subject: [PATCH] Bug_21214: Changes after merge
>
>---
> misc/cronjobs/cleanup_database.pl | 20 --------------------
> 1 file changed, 20 deletions(-)
>
>diff --git a/misc/cronjobs/cleanup_database.pl b/misc/cronjobs/cleanup_database.pl
>index 8e29581f3e..f39b15e4f1 100755
>--- a/misc/cronjobs/cleanup_database.pl
>+++ b/misc/cronjobs/cleanup_database.pl
>@@ -229,18 +229,15 @@ if ($pDebarments && $allDebarments) {
>     usage(1);
> }
> 
>-<<<<<<< HEAD
> say "Confirm flag not passed, running in dry-run mode..." unless $confirm;
> 
> cronlogaction() unless $confirm;
>-=======
> if (!$mail && $letter_codes) {
>     print "You should not specify --keep-lc if you're not cleaning emails.\n\n";
>     usage(1);
> }
> 
> cronlogaction();
>->>>>>>> Bug 21214: cleanup_database.pl --keep-lc to dodge deletion in message_queue based on letter_code
> 
> my $dbh = C4::Context->dbh();
> my $sth;
>@@ -297,22 +294,6 @@ if ($zebraqueue_days) {
> if ($mail) {
>     my $count = 0;
>     print "Mail queue purge triggered for $mail days.\n" if $verbose;
>-<<<<<<< HEAD
>-    $sth = $dbh->prepare(
>-        q{
>-            DELETE FROM message_queue
>-            WHERE time_queued < date_sub(curdate(), INTERVAL ? DAY)
>-        }
>-    );
>-    if ( $confirm ) {
>-        $sth->execute($mail) or die $dbh->errstr;
>-        $count = $sth->rows;
>-    }
>-    if ( $verbose ) {
>-        say $confirm ? "$count messages were deleted from the mail queue." : "Message from message_queue would have been deleted";
>-        say "Done with message_queue purge.";
>-    }
>-=======
>     print "Not deleting emails of type $letter_codes.\n" if ($verbose && $letter_codes);
>     my $query = q{
>         DELETE FROM message_queue
>@@ -329,7 +310,6 @@ if ($mail) {
>     $count = $sth->rows;
>     $sth->finish;
>     print "$count messages were deleted from the mail queue.\nDone with message_queue purge.\n" if $verbose;
>->>>>>>> Bug 21214: cleanup_database.pl --keep-lc to dodge deletion in message_queue based on letter_code
> }
> 
> if ($purge_merged) {
>-- 
>2.17.1

Actions: View | Diff | Splinter Review

Attachments on bug 21214: 77756 | 77762 | 112992 | 112993 | 112994 | 113002 | 113008 | 113009 | 148622 | 148623 | 148624 | 148625 | 158679 | 158680 | 158681 | 162064