1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-07 03:22:57 +03:00
This commit is contained in:
david hill
2016-05-16 13:32:59 -05:00
parent 304c44850a
commit 910d8ce8cf

View File

@@ -601,7 +601,7 @@ RPMSAVE:
cmd = "./remote_scp_get.sh " + installParentModuleIPAddr + " " + password + " " + installDir + "" + installLocation + "/etc/calpont.xml.rpmsave " + systemUser + " " + debug_flag; cmd = "./remote_scp_get.sh " + installParentModuleIPAddr + " " + password + " " + installDir + "" + installLocation + "/etc/calpont.xml.rpmsave " + systemUser + " " + debug_flag;
rtnCode = system(cmd.c_str()); rtnCode = system(cmd.c_str());
if (rtnCode == 0) { if (rtnCode == 0) {
cmd = "mv Calpont.xml.rpmsave " + systemDir + "" + installLocation + ".xml"; cmd = "mv Calpont.xml.rpmsave " + systemDir + "Calpont.xml";
rtnCode = system(cmd.c_str()); rtnCode = system(cmd.c_str());
if ( rtnCode != 0 ) { if ( rtnCode != 0 ) {
cout << "ERROR: No system Calpont.xml or Calpont.xml.rpmsave found, exiting" << endl; cout << "ERROR: No system Calpont.xml or Calpont.xml.rpmsave found, exiting" << endl;
@@ -631,7 +631,7 @@ CONFIGDONE:
Config* sysConfigOld; Config* sysConfigOld;
try { try {
sysConfigOld = Config::makeConfig( systemDir + "" + installLocation + ".xml"); sysConfigOld = Config::makeConfig( systemDir + "/Calpont.xml");
} }
catch(...) catch(...)
{ {