Move --cert-dir option to the begging of arguments

Add changelog entry and bump version in order to release bugfix
codilime · Jun 26, 2017 · 449d5fd · 449d5fd
1 parent 69fa01d
commit 449d5fd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,11 @@
 # Veles changelog
 
+## 2017.06.0.1 (2017-06-26)
+
+### Bugfix
+
+  * Fixed invocation of server so it doesn't fail when installed from .deb package
+
 ## 2017.06.0.SWOND (2017-06-22)
 
 ### Major features and changes:

diff --git a/src/ui/connectionmanager.cc b/src/ui/connectionmanager.cc
@@ -176,12 +176,12 @@ void ConnectionManager::startLocalServer() {
   QStringList arguments;
   arguments
       << server_file_name
+      << "--cert-dir" << connection_dialog_->certificateDir()
       << QString("%1://%2@%3:%4").arg(scheme)
       .arg(connection_dialog_->authenticationKey())
       .arg(connection_dialog_->serverHost())
       .arg(connection_dialog_->serverPort())
-      << connection_dialog_->databaseFile()
-      << "--cert-dir" << connection_dialog_->certificateDir();
+      << connection_dialog_->databaseFile();
 
 #if defined(Q_OS_LINUX)
   QString python_interpreter_executable("/usr/share/veles-server/venv/bin/python3");

diff --git a/src/util/version.cc b/src/util/version.cc
@@ -23,7 +23,7 @@ namespace version {
 const unsigned year = 2017;
 const unsigned month = 6;
 const unsigned release = 0;
-const unsigned patch = 0;
+const unsigned patch = 1;
 const QString codename = "SWOND";
 const QString string = patch ?
   QString("%1.%2.%3.%4.%5").arg(