From d4179035de87e525794be5e7feab5a562eb698c5 Mon Sep 17 00:00:00 2001 From: Knniggett Date: Sat, 7 Sep 2013 15:08:09 -0500 Subject: [PATCH 1/2] Modify zmupdate for 1.26.1 and 1.26.2 releases --- db/Makefile.am | 4 +++- db/zm_update-1.26.1.sql | 6 ++++++ db/zm_update-1.26.2.sql | 6 ++++++ 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 db/zm_update-1.26.1.sql create mode 100644 db/zm_update-1.26.2.sql diff --git a/db/Makefile.am b/db/Makefile.am index bd6738131..51b764597 100644 --- a/db/Makefile.am +++ b/db/Makefile.am @@ -42,4 +42,6 @@ EXTRA_DIST = \ zm_update-1.24.2.sql \ zm_update-1.24.3.sql \ zm_update-1.24.4.sql \ - zm_update-1.26.0.sql + zm_update-1.26.0.sql \ + zm_update-1.26.1.sql \ + zm_update-1.26.2.sql diff --git a/db/zm_update-1.26.1.sql b/db/zm_update-1.26.1.sql new file mode 100644 index 000000000..3fcdc1cbe --- /dev/null +++ b/db/zm_update-1.26.1.sql @@ -0,0 +1,6 @@ +-- +-- This updates a 1.26.0 database to 1.26.1 +-- +-- No changes required +-- + diff --git a/db/zm_update-1.26.2.sql b/db/zm_update-1.26.2.sql new file mode 100644 index 000000000..2ff17a8a5 --- /dev/null +++ b/db/zm_update-1.26.2.sql @@ -0,0 +1,6 @@ +-- +-- This updates a 1.26.1 database to 1.26.2 +-- +-- No changes required +-- + From 8f3d95fd38abd507c5bd859c67b553009c3b2a56 Mon Sep 17 00:00:00 2001 From: Knniggett Date: Sat, 7 Sep 2013 15:11:57 -0500 Subject: [PATCH 2/2] modify zmupdate.pl.in --- scripts/zmupdate.pl.in | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/scripts/zmupdate.pl.in b/scripts/zmupdate.pl.in index cbf071994..0e712a64d 100644 --- a/scripts/zmupdate.pl.in +++ b/scripts/zmupdate.pl.in @@ -986,6 +986,20 @@ if ( $version ) $sth->finish(); $cascade = !undef; } + if ( $cascade || $version eq "1.26.1" ) + { + # Patch the database + patchDB( $dbh, "1.26.1" ); + $cascade = !undef; + } + + if ( $cascade || $version eq "1.26.2" ) + { + # Patch the database + patchDB( $dbh, "1.26.2" ); + $cascade = !undef; + } + if ( $cascade ) { my $installed_version = ZM_VERSION;