Merge pull request #116 from knnniggett/zmupdate_newrelease

Add 1.26.1 and 1.26.2 releases to zmupdate
ZoneMinder · Sep 8, 2013 · 6c134f9 · 6c134f9
2 parents 0a9e63c + 8f3d95f
commit 6c134f9
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 1 deletion.
diff --git 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
@@ -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
@@ -0,0 +1,6 @@
+--
+-- This updates a 1.26.1 database to 1.26.2
+--
+-- No changes required
+--
+
diff --git a/scripts/zmupdate.pl.in b/scripts/zmupdate.pl.in
@@ -1025,6 +1025,20 @@ if ( $version )
 
 		$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;