x2go-commits

x2go-commits@lists.x2go.org

1 participants
37901 discussions

[x2goclient] 40/94: update debian/changelog
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

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 849181bfb6704b7dd17a3b0c570f51b769819b5f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon May 14 11:53:01 2018 +0200 update debian/changelog --- debian/changelog | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 619ded84..eefae437 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,16 +5,20 @@ pyhoca-cli (0.5.99.1-0x2go1) UNRELEASED; urgency=medium - Add --force-password command line switch to override SSH key detection code. - Add --try-resume cmd line option and feature. + - setup.py: Fix version string detection. (Copy+paste flaw...). * debian/rules: + Build for Python3, not Python2. + + Switch to pybuild DH build system. + Enforce Python3 build, fix FTBFS. + + Ignore failures during dh_auto_clean. Helps with build envs that don't have + python3-setuptools installed when building source packages. * debian/control: + Fix src:pkg header part. + Switch to python3-* dependencies. + White-space fix. + Bump versioned D (pyhoca-cli): python-x2go (>= 0.5.99.0~). - * debian/rules: - + Switch to pybuild DH build system. + + 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(a)das-netzwerkteam.de> Sat, 12 May 2018 20:37:21 +0000 -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 39/94: debian/control: Drop D (pyhoca-cli): python3-argparse. Part of stdlib in Python3 these days.
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

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 afcf64ff7110650926e310dcc22f395738cbe13c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon May 14 11:51:18 2018 +0200 debian/control: Drop D (pyhoca-cli): python3-argparse. Part of stdlib in Python3 these days. --- debian/control | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/control b/debian/control index 3e54925f..8ba8f890 100644 --- a/debian/control +++ b/debian/control @@ -24,7 +24,6 @@ Depends: ${python3:Depends}, python3, python3-x2go (>=0.5.99.1-0~), - python3-argparse, python3-setproctitle, Suggests: mteleplayer-clientside, -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 38/94: setup.py: Fix version string detection. (Copy+paste flaw...).
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

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 de1d266f2d33e4b9d444ae5eded521dc8008cbc3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon May 14 09:59:55 2018 +0200 setup.py: Fix version string detection. (Copy+paste flaw...). --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index cbc069a4..6376de78 100755 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ import os from setuptools import setup __VERSION__ = "0.0.0.0" -for line in open(os.path.join('x2go', '__init__.py'),encoding='utf-8').readlines(): +for line in open(os.path.join('pyhoca', 'cli', '__init__.py'),encoding='utf-8').readlines(): if (line.startswith('__VERSION__')): exec(line.strip()) PROGRAM_VERSION = __VERSION__ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 37/94: debian/rules: Ignore failures during dh_auto_clean. Helps with build envs that don't have python3-setuptools installed when building source packages.
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

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 341fe801e565952e6073cf21855b2c792a0d5180 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun May 13 18:31:27 2018 +0000 debian/rules: Ignore failures during dh_auto_clean. Helps with build envs that don't have python3-setuptools installed when building source packages. --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index edd72bc8..e03da227 100755 --- a/debian/rules +++ b/debian/rules @@ -8,4 +8,4 @@ override_dh_auto_clean: rm -Rf PyHoca_CLI.egg-info/ - dh_auto_clean + -dh_auto_clean -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 36/94: Add --try-resume cmd line option and feature. Bump version to 0.5.99.1.
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

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 e2dedb1ce4f755197167cb350379d7c961683762 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat May 12 22:46:30 2018 +0200 Add --try-resume cmd line option and feature. Bump version to 0.5.99.1. --- debian/changelog | 7 ++++--- debian/control | 2 +- man/man1/pyhoca-cli.1 | 5 ++++- pyhoca-cli | 2 +- pyhoca-cli.spec | 4 ++-- pyhoca/cli/__init__.py | 2 +- pyhoca/cli/frontend.py | 27 ++++++++++++++++++++++++++- 7 files changed, 39 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 37dfb7cf..619ded84 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ -pyhoca-cli (0.5.99.0-0x2go1) UNRELEASED; urgency=medium +pyhoca-cli (0.5.99.1-0x2go1) UNRELEASED; urgency=medium - * New upstream version (0.5.99.0). + * New upstream version (0.5.99.1). - Port to Python3. - Add --force-password command line switch to override SSH key detection code. + - Add --try-resume cmd line option and feature. * debian/rules: + Build for Python3, not Python2. + Enforce Python3 build, fix FTBFS. @@ -16,7 +17,7 @@ pyhoca-cli (0.5.99.0-0x2go1) UNRELEASED; urgency=medium + Switch to pybuild DH build system. * debian/{control,compat}: Bump to DH version level 9. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 22 Sep 2017 14:09:18 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 12 May 2018 20:37:21 +0000 pyhoca-cli (0.5.0.4-0x2go1) unstable; urgency=medium diff --git a/debian/control b/debian/control index 21751792..3e54925f 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ Depends: ${misc:Depends}, ${python3:Depends}, python3, - python3-x2go (>=0.5.99.0-0~), + python3-x2go (>=0.5.99.1-0~), python3-argparse, python3-setproctitle, Suggests: diff --git a/man/man1/pyhoca-cli.1 b/man/man1/pyhoca-cli.1 index c1c575d8..750b5f7f 100644 --- a/man/man1/pyhoca-cli.1 +++ b/man/man1/pyhoca-cli.1 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH pyhoca-cli 1 "Sep 2017" "Version 0.5.0.5" "X2Go Application" +.TH pyhoca-cli 1 "Sep 2017" "Version 0.5.99.1" "X2Go Application" .SH NAME pyhoca-cli \- X2Go command line client written in Python .SH SYNOPSIS @@ -70,6 +70,9 @@ The name of the session profile to be used to make the connection. \*(T<\fB\-N, \-\-new\fR\*(T> Start a new X2Go session on server (default mode if no mode is explicitly specified). .TP +\*(T<\fB\-\-try\-resume\fR\*(T> +When given with \fI\-\-new\fR , try finding and resuming a session originally started with the same command. If that fails, start a new session, finally. +.TP \*(T<\fB\-R, \-\-resume\fR \fI<SESSION_NAME>\fR\*(T> Resume existing X2Go session <SESSION_NAME> on server. Special values for <SESSION_NAME> are ,,NEWEST'' (will resume youngest session) or ,,OLDEST'' (resume session with oldest timestamp). diff --git a/pyhoca-cli b/pyhoca-cli index 24913f5b..1df4cac5 100755 --- a/pyhoca-cli +++ b/pyhoca-cli @@ -128,6 +128,7 @@ liblogger = x2go.X2GoLogger() # exclusive client control options action_options = [ {'args':['-N','--new'], 'default': False, 'action': 'store_true', 'help': 'start a new X2Go session on server (default)', }, + {'args':['--try-resume'], 'default': False, 'action': 'store_true', 'help': 'if given with --new, try to resume a running/suspended session, otherwise start a new session', }, {'args':['-R','--resume'], 'default': None, 'metavar': 'SESSION_NAME', 'help': 'resume a suspended X2Go session with name SESSION_NAME', }, {'args':['-D','--share-desktop'], 'default': None, 'metavar': 'USER@DISPLAY', 'help': 'share an X2Go session on server specified by USER@DISPLAY', }, {'args':['-S','--suspend'], 'default': None, 'metavar': 'SESSION_NAME', 'help': 'suspend running X2Go session SESSION_NAME', }, @@ -427,4 +428,3 @@ if __name__ == '__main__': except (KeyboardInterrupt, SystemExit) as e: x2go.x2go_cleanup(e) - diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec index 2d860936..4e4425dd 100644 --- a/pyhoca-cli.spec +++ b/pyhoca-cli.spec @@ -1,5 +1,5 @@ Name: pyhoca-cli -Version: 0.5.99.0 +Version: 0.5.99.1 Release: 0.0x2go1%{?dist} Summary: Command line X2Go client written in Python @@ -19,7 +19,7 @@ BuildRequires: fdupes %endif BuildRequires: python3-setuptools Requires: python3-setproctitle -Requires: python3-x2go >= 0.5.99.0 +Requires: python3-x2go >= 0.5.99.1 Requires: python3-argparse BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/pyhoca/cli/__init__.py b/pyhoca/cli/__init__.py index bebfe4aa..111e8bb5 100644 --- a/pyhoca/cli/__init__.py +++ b/pyhoca/cli/__init__.py @@ -25,6 +25,6 @@ For further information on X2Go, please visit the X2Go wiki: http://wiki.x2go.org """ -__VERSION__ = "0.5.99.0" +__VERSION__ = "0.5.99.1" from .frontend import * diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index be0fcbcc..0eca99f5 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -219,7 +219,8 @@ class PyHocaCLI(x2go.X2GoClient): """ # resume a running session self.logger('resuming X2Go session: %s' % self.args.resume, loglevel=x2go.loglevel_INFO, ) - available_sessions = self._X2GoClient__list_sessions(s_hash) + if available_sessions is None: + available_sessions = self._X2GoClient__list_sessions(s_hash) if available_sessions and self.args.resume == 'OLDEST': self._auto_resume_oldest(s_hash) elif available_sessions and self.args.resume == 'NEWEST': @@ -229,6 +230,26 @@ class PyHocaCLI(x2go.X2GoClient): else: self._runtime_error('requested session not available on X2Go server [%s]:%s' % (self.args.server, self.args.remote_ssh_port), exitcode=20) + def try_resume_session(self, s_hash): + """\ + Use C{X2GoSession} object with session UUID C{s_hash} to resume a server-side suspended X2Go session + or to take over a server-side running X2Go session. + + @param s_hash: session UUID + @type s_hash: C{str} + + """ + self.logger('trying to resume / take over X2Go session with command: %s' % self.args.command, loglevel=x2go.loglevel_INFO, ) + available_sessions = self._X2GoClient__list_sessions(s_hash, with_command=self.args.command) + if available_sessions: + self.logger('matching sessions found: %s' % available_sessions.keys(), loglevel=x2go.loglevel_INFO, ) + self.logger('picking the first in list: %s' % list(available_sessions.keys())[0], loglevel=x2go.loglevel_INFO, ) + # FIXME: what session do we want to resume really (oldest, newest, etc.)? + self._X2GoClient__resume_session(s_hash, list(available_sessions.keys())[0]) + return True + else: + return False + def share_desktop_session(self, s_hash): """\ Use C{X2GoSession} object with session UUID C{s_hash} to share a server-side X2Go desktop session that is available for sharing. @@ -535,6 +556,10 @@ class PyHocaCLI(x2go.X2GoClient): elif self.args.terminate: self.terminate_session(self.x2go_session_hash) + elif self.args.new and self.args.try_resume and self.try_resume_session(self.x2go_session_hash): + # nothing to do here, if resumption attempt was successful + pass + elif self.args.new: self.new_session(self.x2go_session_hash) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 35/94: pyhoca-cli.1: Rephrase info for --from-stdin slightly.
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

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 252bb315a59bdb3e82af1d45d250739de324e1dd Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat May 12 22:46:11 2018 +0200 pyhoca-cli.1: Rephrase info for --from-stdin slightly. --- man/man1/pyhoca-cli.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/man1/pyhoca-cli.1 b/man/man1/pyhoca-cli.1 index 231dd944..c1c575d8 100644 --- a/man/man1/pyhoca-cli.1 +++ b/man/man1/pyhoca-cli.1 @@ -89,7 +89,7 @@ Terminate running X2Go session <SESSION_NAME>. A special value for <SESSION_NAME List user's X2Go sessions on server. .TP \*(T<\fB\-\-from-stdin\fR\*(T> -For LightDM remote login integration: read <username> <host[:port]> <desktopshell> <password> from STDIN' and start a new session, transfer +For LightDM remote login integration: read <username> <host[:port]> <command> <password> from STDIN' and start a new session, transfer a running session or resume a suspended session. If there are several sessions running/suspended of the same desktop shell, then the first -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 34/94: man page: Add --force-password option.
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

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 4e61d8da3388b72bdae5e202da62a3e93a77996b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Mar 7 12:55:44 2018 +0100 man page: Add --force-password option. --- man/man1/pyhoca-cli.1 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/man/man1/pyhoca-cli.1 b/man/man1/pyhoca-cli.1 index 340ebaa8..231dd944 100644 --- a/man/man1/pyhoca-cli.1 +++ b/man/man1/pyhoca-cli.1 @@ -119,6 +119,9 @@ User password for this session. If a matching private SSH key is available this authentication. The cleartext password that has been specified at the command line will be masqueraded in the systems process list (Linux, MacOS). On Windows systems the usage of the \-\-password option is forbidden. .TP +\*(T<\fB\-\-force-password\fR\*(T> +Enforce authentication with username and password, prohibit SSH public/private key authentication. +.TP \*(T<\fB\-p, \-\-remote-ssh-port\fR \fI<R_PORT>\fR\*(T> Remote X2Go server's SSH port (default: 22). .TP -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 32/94: pyhoca-cli: Add --force-password command line switch to override SSH key detection code.
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

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 835cd53bd275130a3a6f5b7582d7de44a0c5bff5 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Mar 6 20:17:50 2018 +0000 pyhoca-cli: Add --force-password command line switch to override SSH key detection code. --- pyhoca-cli | 1 + pyhoca/cli/frontend.py | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pyhoca-cli b/pyhoca-cli index c5ac402f..24913f5b 100755 --- a/pyhoca-cli +++ b/pyhoca-cli @@ -156,6 +156,7 @@ x2go_options = [ {'args':['-c','--command'], 'default': 'TERMINAL', 'help': 'command to run with -R mode on server (default: xterm)', }, {'args':['-u','--username'], 'default': None, 'help': 'username for the session (default: current user)', }, {'args':['--password'], 'default': None, 'help': 'user password for session authentication', }, + {'args':['--force-password'], 'default': False, 'action': 'store_true', 'help': 'enforce username/password authentication', }, {'args':['-p','--remote-ssh-port'], 'default': '22', 'help': 'remote SSH port (default: 22)', }, {'args':['-k','--ssh-privkey'], 'default': None, 'help': 'use file \'SSH_PRIVKEY\' as private key for the SSH connection (e.g. ~/.ssh/id_rsa)', }, {'args':['--add-to-known-hosts'], 'default': False, 'action': 'store_true', 'help': 'add RSA host key fingerprint to ~/.ssh/known_hosts if authenticity of server can\'t be established (default: not set)', }, diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index ce0415ad..be0fcbcc 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -441,7 +441,8 @@ class PyHocaCLI(x2go.X2GoClient): """ connected = False - force_password_auth = False + force_password_auth = self.args.force_password + _username = self.args.username or self._X2GoClient__get_session_username(self.x2go_session_hash) # if we still don't have a valid user name, try the broker... @@ -452,6 +453,8 @@ class PyHocaCLI(x2go.X2GoClient): _auth_count = self.auth_attempts +1 while not connected and _auth_count: try: + if 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 force_password_auth = False -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 33/94: debian/changelog
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

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 aa43e5a9080ab9721ae8b3c4a480b3d3e0126230 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Mar 6 21:24:09 2018 +0100 debian/changelog update debian/changelog --- debian/changelog | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index aad98e3c..37dfb7cf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,9 @@ pyhoca-cli (0.5.99.0-0x2go1) UNRELEASED; urgency=medium - * Port to Python3. - * Bump upstream version to 0.5.99.0. + * New upstream version (0.5.99.0). + - Port to Python3. + - Add --force-password command line switch to override SSH key detection + code. * debian/rules: + Build for Python3, not Python2. + Enforce Python3 build, fix FTBFS. -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 31/94: Enforce Python3 build, fix FTBFS. (debian/rules: Switch to pybuild DH build system.)
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

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 c1ff8d4ad847a8f1036cb0eb175043a850313b30 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Mar 6 20:59:30 2018 +0100 Enforce Python3 build, fix FTBFS. (debian/rules: Switch to pybuild DH build system.) --- debian/changelog | 3 +++ debian/control | 6 +++--- debian/rules | 4 +--- setup.py | 5 ++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 51aa0ad2..aad98e3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,11 +4,14 @@ pyhoca-cli (0.5.99.0-0x2go1) UNRELEASED; urgency=medium * Bump upstream version to 0.5.99.0. * debian/rules: + Build for Python3, not Python2. + + Enforce Python3 build, fix FTBFS. * debian/control: + Fix src:pkg header part. + Switch to python3-* dependencies. + White-space fix. + Bump versioned D (pyhoca-cli): python-x2go (>= 0.5.99.0~). + * debian/rules: + + Switch to pybuild DH build system. * debian/{control,compat}: Bump to DH version level 9. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 22 Sep 2017 14:09:18 +0200 diff --git a/debian/control b/debian/control index 29db8833..21751792 100644 --- a/debian/control +++ b/debian/control @@ -8,14 +8,14 @@ Uploaders: Build-Depends: debhelper (>= 9), man2html-base | man2html, - python3 (>=2.6.5-0~), + python3-all (>= 3.4), python3-setuptools, - python3-support (>=0.90) | dh-python + dh-python, Standards-Version: 4.1.0 Homepage: http://code.x2go.org/releases/source/pyhoca-cli Vcs-Git: git://code.x2go.org/pyhoca-cli.git Vcs-Browser: http://code.x2go.org/gitweb?p=pyhoca-cli.git;a=summary -X-Python3-Version: >= 3.6 +X-Python3-Version: >= 3.4 Package: pyhoca-cli Architecture: all diff --git a/debian/rules b/debian/rules index 3f273214..edd72bc8 100755 --- a/debian/rules +++ b/debian/rules @@ -3,10 +3,8 @@ # Based on sample debian/rules file - for GNU Hello (1.3). # Copyright 2010-2016 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -WITH_PYTHON3 = $(shell test -f /usr/bin/dh_python3 && echo "--with python3") - %: - dh ${@} ${WITH_PYTHON3} + dh ${@} --with=python3 --buildsystem=pybuild override_dh_auto_clean: rm -Rf PyHoca_CLI.egg-info/ diff --git a/setup.py b/setup.py index 03e52dca..cbc069a4 100755 --- a/setup.py +++ b/setup.py @@ -22,9 +22,8 @@ import os from setuptools import setup -# silence pyflakes, __VERSION__ is properly assigned below... -__VERSION__ = '0.0.0.0' -for line in file(os.path.join('pyhoca', 'cli', '__init__.py')).readlines(): +__VERSION__ = "0.0.0.0" +for line in open(os.path.join('x2go', '__init__.py'),encoding='utf-8').readlines(): if (line.startswith('__VERSION__')): exec(line.strip()) PROGRAM_VERSION = __VERSION__ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits