Merge pull request #1203 from subutai-io/dev

Dev
subutai-io · Jun 20, 2018 · 0d979b2 · 0d979b2
2 parents cf5aaf4 + a74a139
commit 0d979b2
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 29 deletions.
diff --git a/commons/src/OsBranchConsts.cpp b/commons/src/OsBranchConsts.cpp
@@ -6,24 +6,24 @@
 #include "SystemCallWrapper.h"
 
 static std::map<QString, QString> virtual_package_codename = {
-    {"xenial", "virtualbox-5.2_5.2.8-121009_Ubuntu_xenial_amd64.deb"},
-    {"bionic", "virtualbox-5.2_5.2.8-121009_Ubuntu_bionic_amd64.deb"},
-    {"zesty", "virtualbox-5.2_5.2.8-121009_Ubuntu_zesty_amd64"},
-    {"yakkety", "virtualbox-5.2_5.2.8-121009_Ubuntu_yakkety_amd64.deb"},
-    {"trusty", "virtualbox-5.2_5.2.8-121009_Ubuntu_trusty_amd64.deb"},
-    {"stretch", "virtualbox-5.2_5.2.8-121009_Debian_stretch_amd64.deb"},
-    {"jessie", "virtualbox-5.2_5.2.8-121009_Debian_jessie_amd64.deb"},
-    {"wheezy", "virtualbox-5.2_5.2.8-121009_Debian_wheezy_amd64.deb"},
-    {"artful", "virtualbox-5.2_5.2.8-121009_Ubuntu_zesty_amd64"},
-    {"qiana", "virtualbox-5.2_5.2.8-121009_Ubuntu_trusty_amd64.deb"}, //compatible with 14.04
-    {"rebecca", "virtualbox-5.2_5.2.8-121009_Ubuntu_trusty_amd64.deb"},
-    {"rafaela", "virtualbox-5.2_5.2.8-121009_Ubuntu_trusty_amd64.deb"},
-    {"rosa", "virtualbox-5.2_5.2.8-121009_Ubuntu_trusty_amd64.deb"},
-    {"sarah", "virtualbox-5.2_5.2.8-121009_Ubuntu_xenial_amd64.deb"}, //compatible with 16.04
-    {"serena", "virtualbox-5.2_5.2.8-121009_Ubuntu_xenial_amd64.deb"},
-    {"sonya", "virtualbox-5.2_5.2.8-121009_Ubuntu_xenial_amd64.deb"},
-    {"sylvia", "virtualbox-5.2_5.2.8-121009_Ubuntu_xenial_amd64.deb"},
-    {"rara", "virtualbox-5.2_5.2.8-121009_Ubuntu_bionic_amd64.deb"} //compatible with 18.04
+    {"xenial",   "virtualbox-xenial.deb"},
+    {"bionic",   "virtualbox-bionic.deb"},
+    {"zesty",    "virtualbox-zesty.deb"},
+    {"yakkety",  "virtualbox-yakkety.deb"},
+    {"trusty",   "virtualbox-trusty.deb"},
+    {"stretch",  "virtualbox-stretch.deb"},
+    {"jessie",   "virtualbox-jessie.deb"},
+    {"wheezy",   "virtualbox-wheezy.deb"},
+    {"artful",   "virtualbox-zesty.deb"},
+    {"qiana",    "virtualbox-trusty.deb"}, //compatible with 14.04
+    {"rebecca",  "virtualbox-trusty.deb"},
+    {"rafaela",  "virtualbox-trusty.deb"},
+    {"rosa",     "virtualbox-trusty.deb"},
+    {"sarah",    "virtualbox-xenial.deb"}, //compatible with 16.04
+    {"serena",   "virtualbox-xenial.deb"},
+    {"sonya",    "virtualbox-xenial.deb"},
+    {"sylvia",   "virtualbox-xenial.deb"},
+    {"rara",     "virtualbox-bionic.deb"} //compatible with 18.04
 };
 
 template<class BR, class OS> const QString& p2p_kurjun_file_name_temp_internal();
@@ -85,7 +85,7 @@ oracle_virtualbox_kurjun_package_name() {
     //first check type of os
     QString type = info.begin()->second;
     if(type == "Windows")
-        kurjun_file = "VirtualBox-5.2.8-121009-Win.exe";
+        kurjun_file = "VirtualBox.exe";
     else if(type == "Mac")
         kurjun_file = "VirtualBox.pkg";
     if(kurjun_file != "not_found")
@@ -132,14 +132,14 @@ template<class BR, class OS> const QString& vagrant_kurjun_package_name_temp_int
   }
 
 vagrant_kurjun_package_name_def(BT_MASTER,     OS_MAC,     "vagrant.pkg")
-vagrant_kurjun_package_name_def(BT_MASTER,     OS_WIN,     "vagrant_2.0.3_x86_64.msi")
-vagrant_kurjun_package_name_def(BT_MASTER,     OS_LINUX,   "vagrant_2.0.3_x86_64.deb")
-vagrant_kurjun_package_name_def(BT_DEV,        OS_LINUX,   "vagrant_2.0.3_x86_64.deb")
+vagrant_kurjun_package_name_def(BT_MASTER,     OS_WIN,     "vagrant.msi")
+vagrant_kurjun_package_name_def(BT_MASTER,     OS_LINUX,   "vagrant.deb")
+vagrant_kurjun_package_name_def(BT_DEV,        OS_LINUX,   "vagrant.deb")
 vagrant_kurjun_package_name_def(BT_DEV,        OS_MAC,     "vagrant.pkg")
-vagrant_kurjun_package_name_def(BT_DEV,        OS_WIN,     "vagrant_2.0.3_x86_64.msi")
-vagrant_kurjun_package_name_def(BT_PROD,      OS_LINUX,    "vagrant_2.0.3_x86_64.deb")
+vagrant_kurjun_package_name_def(BT_DEV,        OS_WIN,     "vagrant.msi")
+vagrant_kurjun_package_name_def(BT_PROD,      OS_LINUX,    "vagrant.deb")
 vagrant_kurjun_package_name_def(BT_PROD,      OS_MAC,      "vagrant.pkg")
-vagrant_kurjun_package_name_def(BT_PROD,      OS_WIN,      "vagrant_2.0.3_x86_64.msi")
+vagrant_kurjun_package_name_def(BT_PROD,      OS_WIN,      "vagrant.msi")
 
 const QString &
 vagrant_kurjun_package_name(){

diff --git a/hub/src/SystemCallWrapper.cpp b/hub/src/SystemCallWrapper.cpp
@@ -615,10 +615,15 @@ QStringList CSystemCallWrapper::list_interfaces(){
     args << "list" << "bridgedifs";
     qDebug()<<path<<args;
     system_call_res_t res = CSystemCallWrapper::ssystem_th(path, args, true, true, 60000);
-    qDebug()<<"Listing interfaces result:"
-            <<"exit code:"<<res.exit_code
-            <<"result:"<<res.res;
-    if(res.exit_code != 0 || res.res != SCWE_SUCCESS)
+    QString output;
+    for (auto s : res.out) {
+      output += s;
+    }
+    qDebug() << "Listing interfaces result:"
+             << "exit code:" << res.exit_code
+             << "result:" << res.res
+             << "output:" << output;
+    if (res.exit_code != 0 || res.res != SCWE_SUCCESS)
         return interfaces;
     //time to parse data
     QStringList parse_me = res.out;