From c0461d4c3deaa8bb6e453f29bd7f20d6989f082e Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Fri, 9 Sep 2016 09:53:53 +0200 Subject: [PATCH] Bug 17135: [QA Follow-up] Change location of new script to fix fines MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The location of the script in misc/maintenance would be fine for running it from the command line. But it will be a problem for several install types when running it from the web installer. Files from misc/maintenance go to bin/maintenance in a package install, not to mention other installs than a dev install. This patch moves the script to installer/data/mysql. Already there are two other scripts run by upgradedatabase. I would rather move these three scripts somewhere else, but we c/should do that on another report. Fixed a small typo in a message too. Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall (cherry picked from commit 8a7a7a034490ced2c2e7de062813645169c5cb71) Signed-off-by: Frédéric Demians --- .../bug_17135-fix_unclosed_nonaccruing_fines.perl | 4 ++-- .../data/mysql}/fix_unclosed_nonaccruing_fines_bug17135.pl | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename {misc/maintenance => installer/data/mysql}/fix_unclosed_nonaccruing_fines_bug17135.pl (100%) diff --git a/installer/data/mysql/atomicupdate/bug_17135-fix_unclosed_nonaccruing_fines.perl b/installer/data/mysql/atomicupdate/bug_17135-fix_unclosed_nonaccruing_fines.perl index f6c28f9da7..7da77d19c3 100644 --- a/installer/data/mysql/atomicupdate/bug_17135-fix_unclosed_nonaccruing_fines.perl +++ b/installer/data/mysql/atomicupdate/bug_17135-fix_unclosed_nonaccruing_fines.perl @@ -2,12 +2,12 @@ $DBversion = '16.06.00.XXX'; if (C4::Context->preference("Version") < TransformToNum($DBversion)) { { print "Attempting upgrade to $DBversion (Bug 17135) ...\n"; - my $maintenance_script = C4::Context->config("intranetdir") . "/misc/maintenance/fix_unclosed_nonaccruing_fines_bug17135.pl"; + my $maintenance_script = C4::Context->config("intranetdir") . "/installer/data/mysql/fix_unclosed_nonaccruing_fines_bug17135.pl"; system("perl $maintenance_script --confirm"); print "Upgrade to $DBversion done (Bug 17135 - Fine for the previous overdue may get overwritten by the next one)\n"; unless ($original_version < TransformToNum("3.23.00.032")) { ## Bug 15675 print "WARNING: There is a possibility (= just a possibility, it's configuration dependent etc.) that - due to regression introduced by Bug 15675 - some old fine records for overdued items (items which got renewed 1+ time while being overdue) may have been overwritten in your production 16.05+ database. See Bugzilla reports for Bug 14390 and Bug 17135 for more details.\n"; - print "WARNING: Please note that this upgrade does not try to recover such overwitten old fine records (if any) - it's just an follow-up for Bug 14390, it's sole purpose is preventing eventuall further-on overwrites from happening in the future. Optional recovery of the overwritten fines (again, if any) is like, totally outside of the scope of this particular upgrade!\n"; + print "WARNING: Please note that this upgrade does not try to recover such overwitten old fine records (if any) - it's just an follow-up for Bug 14390, its sole purpose is preventing eventual further-on overwrites from happening in the future. Optional recovery of the overwritten fines (again, if any) is like, totally outside of the scope of this particular upgrade!\n"; } SetVersion ($DBversion); } diff --git a/misc/maintenance/fix_unclosed_nonaccruing_fines_bug17135.pl b/installer/data/mysql/fix_unclosed_nonaccruing_fines_bug17135.pl similarity index 100% rename from misc/maintenance/fix_unclosed_nonaccruing_fines_bug17135.pl rename to installer/data/mysql/fix_unclosed_nonaccruing_fines_bug17135.pl -- 2.39.5