From 449d5fd772c229822003476191c04a811d2908b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wiktor=20Niesiob=C4=99dzki?= Date: Mon, 26 Jun 2017 11:54:16 +0200 Subject: [PATCH] Move --cert-dir option to the begging of arguments Add changelog entry and bump version in order to release bugfix --- changelog.md | 6 ++++++ src/ui/connectionmanager.cc | 4 ++-- src/util/version.cc | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/changelog.md b/changelog.md index 6d1a26e5..35b770fd 100644 --- 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 index 1e7bdb29..58c45414 100644 --- 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 index 431e1dd5..a9f7a7ab 100644 --- 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(