Bugzilla – Attachment 13428 Details for
Bug 7167
updatedatabase improvements
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 7167: Reimplementing Marcel's suggestions & fixes
Bug-7167-Reimplementing-Marcels-suggestions--fixes.patch (text/plain), 2.57 KB, created by
Chris Nighswonger
on 2012-11-13 15:58:29 UTC
(
hide
)
Description:
Bug 7167: Reimplementing Marcel's suggestions & fixes
Filename:
MIME Type:
Creator:
Chris Nighswonger
Created:
2012-11-13 15:58:29 UTC
Size:
2.57 KB
patch
obsolete
>From 7c1abe80eee65ce2fc458bad547f623631e84239 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Tue, 31 Jul 2012 09:50:14 +0200 >Subject: [PATCH] Bug 7167: Reimplementing Marcel's suggestions & fixes >Content-Type: text/plain; charset="utf-8" > > * Fixing the bugguy old version check (that was made against 3.0900000 instead of 3.0900027 -the last current kohaversion number > * in the CLI script, if there is nothing to report, just say it > >Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> >--- > C4/Auth.pm | 2 +- > installer/data/mysql/update.pl | 2 +- > installer/install.pl | 4 ++-- > 3 files changed, 4 insertions(+), 4 deletions(-) > >diff --git a/C4/Auth.pm b/C4/Auth.pm >index ff96cf3..40de536 100644 >--- a/C4/Auth.pm >+++ b/C4/Auth.pm >@@ -585,7 +585,7 @@ sub version_check { > } > > # check if you're uptodate, and if you're not, head to updater >- my $koha39 =~ "3.0900000"; >+ my $koha39 = "3.0900028"; > > # Old updatedatabase method > if (C4::Context->preference('Version') < $koha39) { >diff --git a/installer/data/mysql/update.pl b/installer/data/mysql/update.pl >index e8dac36..605fe6c 100644 >--- a/installer/data/mysql/update.pl >+++ b/installer/data/mysql/update.pl >@@ -59,7 +59,7 @@ if ( $all ) { > } > > if ( $version or $all ) { >- say "Report:"; >+ say @reports ? "Report:": "Nothing to report"; > for my $report ( @reports ) { > my ( $v, $r ) = each %$report; > if ( ref( $r ) eq 'HASH' ) { >diff --git a/installer/install.pl b/installer/install.pl >index 7a6849a..6b97cba 100755 >--- a/installer/install.pl >+++ b/installer/install.pl >@@ -321,7 +321,7 @@ elsif ( $step && $step == 3 ) { > warn "# plack? inserted PERL5LIB $ENV{PERL5LIB}\n"; > } > >- my $koha39 =~ "3.0900000"; >+ my $koha39 = "3.0900028"; > my $cmd; > # Old updatedatabase method > my $current_version = C4::Context->preference('Version'); >@@ -329,7 +329,7 @@ elsif ( $step && $step == 3 ) { > $cmd = C4::Context->config("intranetdir") . "/installer/data/$info{dbms}/updatedatabase.pl"; > my ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf) = IPC::Cmd::run(command => $cmd, verbose => 0); > print_std( "updatedatabase.pl", $stdout_buf, $stderr_buf ); >- >+ $current_version= $koha39; > } > $cmd = C4::Context->config("intranetdir") . "/installer/data/$info{dbms}/update.pl -all -min=$current_version"; > my ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf) = IPC::Cmd::run(command => $cmd, verbose => 0); >-- >1.7.9.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 7167
:
6377
|
6378
|
6379
|
6381
|
6414
|
6415
|
6416
|
6476
|
6477
|
6478
|
6479
|
6722
|
6832
|
7903
|
8178
|
9859
|
9860
|
9861
|
9862
|
10033
|
10034
|
10549
|
10666
|
10667
|
10668
|
10825
|
11129
|
11222
|
11223
|
11224
|
11225
|
11226
|
11227
|
11228
|
11229
|
11230
|
11231
|
11232
|
11235
|
11236
|
11237
|
11238
|
11239
|
11240
|
11241
|
11242
|
11243
|
11244
|
11245
|
11246
|
11571
|
13423
|
13424
|
13425
|
13426
|
13427
|
13428
|
13429
|
13430
|
13431
|
13432
|
13433
|
13434
|
13435
|
13436
|
13437
|
13456
|
13457
|
13509
|
13516
|
13517
|
13518
|
13519
|
13520
|
13521
|
13522
|
13523
|
13524
|
13525
|
13526
|
13527
|
13528
|
13529
|
13733
|
13734
|
13842
|
13845
|
13848
|
13851
|
13852
|
13853
|
13854
|
14310
|
16113
|
16114
|
16115
|
16116
|
16117
|
16596