diff options
author | Benoit Foucher <benoit@zeroc.com> | 2009-12-04 15:53:54 +0100 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2009-12-04 15:53:54 +0100 |
commit | 8544fc03f69b14b036092d5b72e834f54d8d3ba6 (patch) | |
tree | b609f226b8c170f9248100578ef1516e3bc490b5 | |
parent | Fixed comments in upgradeicegrid.py (diff) | |
download | ice-8544fc03f69b14b036092d5b72e834f54d8d3ba6.tar.bz2 ice-8544fc03f69b14b036092d5b72e834f54d8d3ba6.tar.xz ice-8544fc03f69b14b036092d5b72e834f54d8d3ba6.zip |
Fixed usage of icestormmigrate and upgradeicegrid.py (bug 3942)
-rwxr-xr-x | cpp/config/upgradeicegrid.py | 7 | ||||
-rw-r--r-- | cpp/src/IceStorm/FreezeDB/Migrate.cpp | 3 |
2 files changed, 5 insertions, 5 deletions
diff --git a/cpp/config/upgradeicegrid.py b/cpp/config/upgradeicegrid.py index 26c6269ab3e..05c4b1efbc8 100755 --- a/cpp/config/upgradeicegrid.py +++ b/cpp/config/upgradeicegrid.py @@ -10,9 +10,7 @@ # # This script upgrades the IceGrid registry database environment for -# 3.1.x or 3.2.x version of IceGrid to the new format (3.3 or 3.4). -# There's no need to upgrade a 3.3 IceGrid registry database to 3.4 -# as the database format did not changed. +# 3.1.x or 3.2.x version of IceGrid to the new format (>= 3.3). # # Usage: # @@ -50,8 +48,7 @@ def usage(): print "Usage: " + sys.argv[0] + " [options] olddbenv newdbenv" print print "This script upgrades a 3.1 or 3.2 IceGrid registry database environment" - print "to a 3.4 database environment. There's no need to upgrade a 3.3 database" - print "environment to 3.4, the database format did not change." + print "to an IceGrid registry 3.3 or superior database environment." print print "Options:" print "-h Show this message." diff --git a/cpp/src/IceStorm/FreezeDB/Migrate.cpp b/cpp/src/IceStorm/FreezeDB/Migrate.cpp index 210e23490a5..c3395a13811 100644 --- a/cpp/src/IceStorm/FreezeDB/Migrate.cpp +++ b/cpp/src/IceStorm/FreezeDB/Migrate.cpp @@ -56,6 +56,9 @@ void Client::usage() { cerr << "Usage: " << appName() << " old-env new-env\n"; + cerr << "\n"; + cerr << "This utility upgrades a 3.1 or 3.2 IceStorm database environment\n"; + cerr << "to a 3.3 or superior IceStorm database environment.\n"; } string |