This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.6.1.0 in repository x2goclient. commit 3a620cc2ec2bf9c54fe71fe7d5ed4af9bb3654b8 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon May 14 14:51:52 2018 +0200 Fix duplicate password prompt. Regression fix. --- debian/changelog | 2 ++ pyhoca/cli/frontend.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index eefae437..439dcb53 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ pyhoca-cli (0.5.99.1-0x2go1) UNRELEASED; urgency=medium code. - Add --try-resume cmd line option and feature. - setup.py: Fix version string detection. (Copy+paste flaw...). + - Fix duplicate password prompt. Regression fix. * debian/rules: + Build for Python3, not Python2. + Switch to pybuild DH build system. @@ -20,6 +21,7 @@ pyhoca-cli (0.5.99.1-0x2go1) UNRELEASED; urgency=medium + Drop D (pyhoca-cli): python3-argparse. Part of stdlib in Python3 these days. * debian/{control,compat}: Bump to DH version level 9. + * -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sat, 12 May 2018 20:37:21 +0000 diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 0eca99f5..5ef0d44e 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -462,7 +462,7 @@ class PyHocaCLI(x2go.X2GoClient): """ connected = False - force_password_auth = self.args.force_password + force_password_auth = False _username = self.args.username or self._X2GoClient__get_session_username(self.x2go_session_hash) @@ -474,7 +474,7 @@ class PyHocaCLI(x2go.X2GoClient): _auth_count = self.auth_attempts +1 while not connected and _auth_count: try: - if force_password_auth: + if self.force_password_auth: self.args.password = getpass.getpass() self._X2GoClient__connect_session(self.x2go_session_hash, username=_username, password=self.args.password, force_password_auth=force_password_auth) connected = True -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git