Merge branch 'fix/catch-unexpected-servername-value' into 'develop'

Display message when incorrectly formatted servername is provided See merge request ProtonVPN/linux/linux-cli!52
iamzoltan · Dec 16, 2021 · 01acd65 · 01acd65
2 parents a7aa150 + 67ce3db
commit 01acd65
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/arch/PKGBUILD b/arch/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Proton Technologies AG <[email protected]>
 pkgname=protonvpn-cli
-pkgver=3.11.0
-pkgrel=7
+pkgver=3.11.1
+pkgrel=1
 pkgdesc="Official ProtonVPN CLI."
 arch=("any")
 url="https://github.com/ProtonVPN/"

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+protonvpn-cli (3.11.1-1) unstable; urgency=medium
+
+  * Bug: Display message when incorrectly formatted servername is provided
+
+ -- Proton Technologies AG <[email protected]>  Thu, 16 Dez 2021 09:00:00 +0000
+
 protonvpn-cli (3.11.0-7) unstable; urgency=medium
 
   * Improve: Handle accounting use cases

diff --git a/protonvpn_cli/cli_wrapper.py b/protonvpn_cli/cli_wrapper.py
@@ -196,7 +196,7 @@ def connect(self, args, only_free=False):
                     connect_type_extra_arg = cls_attr[0]
                     break
 
-                connect_type_extra_arg = cls_attr[1]
+                connect_type_extra_arg = cls_attr[1].replace(" ", "")
 
         protocol = args.protocol
 
@@ -279,7 +279,7 @@ def connect(self, args, only_free=False):
             )
             print(killswitch_msg)
             return 1
-        except exceptions.IllegalServername as e:
+        except exceptions.UnexpectedServername as e:
             logger.exception(e)
             print(
                 "\nProvided servername is invalid. Please ensure that you've "

diff --git a/protonvpn_cli/constants.py b/protonvpn_cli/constants.py
@@ -1,4 +1,4 @@
-APP_VERSION = "3.11.0"
+APP_VERSION = "3.11.1"
 LOGGER_NAME = "protonvpn-cli"
 
 MAIN_CLI_HELP = """

diff --git a/rpmbuild/SPECS/protonvpn-cli.spec b/rpmbuild/SPECS/protonvpn-cli.spec
@@ -1,6 +1,6 @@
 %define unmangled_name protonvpn-cli
-%define version 3.11.0
-%define release 7
+%define version 3.11.1
+%define release 1
 
 Prefix: %{_prefix}
 
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 
 %changelog
+* Thu Dez 16 2021 Proton Technologies AG <[email protected]> 3.11.1-1
+- Bug: Display message when incorrectly formatted servername is provided
+
 * Thu Nov 12 2021 Proton Technologies AG <[email protected]> 3.11.0-7
 - Improve: Handle accounting use cases