database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-09-02 12:41:17 +03:00
Code Activity

change code to determine package type

Browse Source
This commit is contained in:
David Hill
2017-03-16 15:58:19 -05:00
parent 4392e4ed9f
commit d4225d6635
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
oamapps/mcsadmin/mcsadmin.cpp
View File

@@ -5007,13 +5007,13 @@ int processCommand(string* arguments)
cout << endl; cout << endl;
if ( rootUser) if ( rootUser)
{ {
system("rpm -qi mariadb-columnstore-platform > /tmp/columnstore.txt 2>&1"); int rtnCode = system("rpm -qi mariadb-columnstore-platform > /tmp/columnstore.txt 2>&1");
if (oam.checkLogStatus("/tmp/columnstore.txt", "Name")) if (WEXITSTATUS(rtnCode) == 0)
system("cat /tmp/columnstore.txt"); system("cat /tmp/columnstore.txt");
else { else {
system("dpkg -s mariadb-columnstore-platform > /tmp/columnstore.txt 2>&1"); rtnCode = system("dpkg -s mariadb-columnstore-platform > /tmp/columnstore.txt 2>&1");
if (oam.checkLogStatus("/tmp/columnstore.txt", "Status: install")) if (WEXITSTATUS(rtnCode) == 0)
system("cat /tmp/columnstore.txt"); system("cat /tmp/columnstore.txt");
else { else {
SystemSoftware systemsoftware; SystemSoftware systemsoftware;
oam.getSystemSoftware(systemsoftware); oam.getSystemSoftware(systemsoftware);

8
oamapps/postConfigure/postConfigure.cpp
View File

@@ -2683,12 +2683,12 @@ int main(int argc, char *argv[])
EEPackageType = "binary"; EEPackageType = "binary";
else else
{ {
system("rpm -qi mariadb-columnstore-platform > /tmp/columnstore.txt 2>&1"); int rtnCode = system("rpm -qi mariadb-columnstore-platform > /tmp/columnstore.txt 2>&1");
if (oam.checkLogStatus("/tmp/columnstore.txt", "Name")) if (WEXITSTATUS(rtnCode) == 0)
EEPackageType = "rpm"; EEPackageType = "rpm";
else { else {
system("dpkg -s mariadb-columnstore-platform > /tmp/columnstore.txt 2>&1"); rtnCode = system("dpkg -s mariadb-columnstore-platform > /tmp/columnstore.txt 2>&1");
if (oam.checkLogStatus("/tmp/columnstore.txt", "Status: install")) if (WEXITSTATUS(rtnCode) == 0)
EEPackageType = "deb"; EEPackageType = "deb";
else else
EEPackageType = "binary"; EEPackageType = "binary";