[icinga-checkins] icinga.org: icinga-core/master: move version update for dbupgrade scripts from update-version into update-version-schema

git at icinga.org git at icinga.org
Wed Jun 29 09:22:43 CEST 2011


Module: icinga-core
Branch: master
Commit: 4ba6295d16a80e01919fbd481de1efde7d929e1a
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=4ba6295d16a80e01919fbd481de1efde7d929e1a

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Wed Jun 29 09:22:07 2011 +0200

move version update for dbupgrade scripts from update-version into update-version-schema

---

 update-version        |    4 ----
 update-version-schema |    7 +++++++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/update-version b/update-version
index b99db4e..c5fb2c0 100755
--- a/update-version
+++ b/update-version
@@ -81,10 +81,6 @@ perl -i -p -e "s/^LASTDATE=.*/LASTDATE=$SHORTDATE/;" update-version
 # Update version number and release date in IDOUtils
 perl -i -p -e "s/IDOMOD_VERSION \".*\"/IDOMOD_VERSION \"$newversion\"/;" module/idoutils/include/idomod.h
 perl -i -p -e "s/IDOMOD_DATE \".*\"/IDOMOD_DATE \"$SHORTDATE\"/;" module/idoutils/include/idomod.h
-perl -i -p -e "s/thisversion=\".*\"/thisversion=\"$newversion\"/;" module/idoutils/db/scripts/upgradedb.in
-perl -i -p -e "s/lastversion=\".*\"/lastversion=\"$newversion\"/;" module/idoutils/db/scripts/upgradedb.in
-perl -i -p -e "s/legacyversion=\".*\"/legacyversion=\"$newversion\"/;" module/idoutils/db/scripts/upgradedb.in
-perl -i -p -e "s/thisversion=\".*\"/thisversion=\"$newversion\"/;" module/idoutils/db/scripts/installdb.in
 perl -i -p -e "s/IDO2DB_VERSION \".*\"/IDO2DB_VERSION \"$newversion\"/;" module/idoutils/include/ido2db.h
 perl -i -p -e "s/IDO2DB_DATE \".*\"/IDO2DB_DATE \"$SHORTDATE\"/;" module/idoutils/include/ido2db.h
 perl -i -p -e "s/SOCKDEBUG_VERSION \".*\"/SOCKDEBUG_VERSION \"$newversion\"/;" module/idoutils/src/sockdebug.c
diff --git a/update-version-schema b/update-version-schema
index 510d52f..b2c2ee5 100755
--- a/update-version-schema
+++ b/update-version-schema
@@ -45,6 +45,13 @@ fi
 perl -i -p -e "s/^CURRENTVERSION=.*/CURRENTVERSION=$newversion/;" update-version-schema
 perl -i -p -e "s/^LASTDATE=.*/LASTDATE=$SHORTDATE/;" update-version-schema
 
+# Update the scripts
+perl -i -p -e "s/thisversion=\".*\"/thisversion=\"$newversion\"/;" module/idoutils/db/scripts/upgradedb.in
+perl -i -p -e "s/lastversion=\".*\"/lastversion=\"$newversion\"/;" module/idoutils/db/scripts/upgradedb.in
+perl -i -p -e "s/legacyversion=\".*\"/legacyversion=\"$newversion\"/;" module/idoutils/db/scripts/upgradedb.in
+perl -i -p -e "s/thisversion=\".*\"/thisversion=\"$newversion\"/;" module/idoutils/db/scripts/installdb.in
+
+
 # Update schema version in IDOUtils
 perl -i -p -e "s/IDO2DB_SCHEMA_VERSION \".*\"/IDO2DB_SCHEMA_VERSION \"$newversion\"/;" module/idoutils/include/ido2db.h
 





More information about the icinga-checkins mailing list