diff options
| author | Patrik Teivonen <patrik.teivonen@qt.io> | 2022-08-17 13:15:29 +0300 |
|---|---|---|
| committer | Patrik Teivonen <patrik.teivonen@qt.io> | 2022-08-29 11:48:17 +0000 |
| commit | 5df2c00598beed383e18b2ff3965d73951454b23 (patch) | |
| tree | 24f6d4e444ac20eb8c31599072e694870b82cf21 | |
| parent | 439e344fe4e5109e597db1862c097bef8ec98714 (diff) | |
Fix incorrect SSHException import, remove paramiko package from Pipfilev6.4.0-beta4-packaging
Change-Id: I48f6d7bb0de2fc8291e5cb2bd3df8d8c745c3953
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| -rw-r--r-- | Pipfile | 1 | ||||
| -rwxr-xr-x | packaging-tools/sign_windows_installer.py | 3 |
2 files changed, 1 insertions, 3 deletions
@@ -27,7 +27,6 @@ black = ">=20.8b1" stestr = "==3.2.1" pre-commit = "==2.17.0" isort = "==5.10.1" -types-paramiko = "==2.10.0" [requires] python_version = "3" diff --git a/packaging-tools/sign_windows_installer.py b/packaging-tools/sign_windows_installer.py index ac22dd3c7..52e85e247 100755 --- a/packaging-tools/sign_windows_installer.py +++ b/packaging-tools/sign_windows_installer.py @@ -42,7 +42,6 @@ from typing import List import pysftp # type: ignore from cryptography.fernet import Fernet -from paramiko import SSHException from installer_utils import PackagingError from logging_util import init_logger @@ -121,7 +120,7 @@ def download_signing_tools(path_to_key: str): with pysftp.Connection(os.getenv("SFTP_ADDRESS"), username=os.getenv("SFTP_USER"), private_key=path_to_key, cnopts=cnopts) as sftp: sftp.get(os.getenv("WINDOWS_SIGNKEYS_PATH")) sftp.get(os.getenv("WINDOWS_SIGNTOOL_X64_PATH")) - except SSHException: + except pysftp.SSHException: raise PackagingError("FTP authentication failed!") from None |