[X2Go-Commits] [x2goclient] 15/25: pyhoca-cli.spec: hopefully fix builds on *SuSE: even pure Python-3-builds need python-devel as a build requirement (only)... for some weird reason.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to annotated tag 0.6.1.2
in repository x2goclient.

commit 9e3be6547ecd3e324cbd12688c13e806fc1bce4f
Author: Mihai Moldovan 
Date:   Tue Dec 24 05:44:00 2019 +0100

pyhoca-cli.spec: hopefully fix builds on *SuSE: even pure Python-3-builds 
need python-devel as a build requirement (only)... for some weird reason.
---
 debian/changelog | 2 ++
 pyhoca-cli.spec  | 5 +
 2 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e8df0eb5..63e87958 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ pyhoca-cli (0.6.1.2-0x2go1) UNRELEASED; urgency=medium
   correct value. Hence, use a global variable to store and mangle the
   preferences and only use %bcond_... X later once.
 + Fix typo in Python-2-Requires: line: random % char.
++ Hopefully fix builds on *SuSE: even pure Python-3-builds need
+  python-devel as a build requirement (only)... for some weird reason.
 
  -- X2Go Release Manager   Fri, 22 Nov 2019 15:26:45 +0100
 
diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec
index e6686972..fc2e45cc 100644
--- a/pyhoca-cli.spec
+++ b/pyhoca-cli.spec
@@ -142,6 +142,11 @@ Requires:   python-setproctitle
 Requires:   %{name_helper_python2}-x2go >= 0.6.1.0
 %endif
 %if 0%{?with_python3}
+%if 0%{?suse_version}
+# For some reason, even pure Python-3-builds need python-devel as a build
+# requirement. Not quite sure why, but builds are failing without it.
+BuildRequires:  python-devel
+%endif
 BuildRequires:  %{name_helper_python3}-devel
 BuildRequires:  %{name_helper_python3}-setuptools
 Requires:   %{name_helper_python3}-setproctitle

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 14/25: pyhoca-cli.spce: fix typo in Python-2-Requires: line: random % char.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to annotated tag 0.6.1.2
in repository x2goclient.

commit 7187ae309c94122e6e4109855a300cf50ee7a352
Author: Mihai Moldovan 
Date:   Tue Dec 24 05:04:25 2019 +0100

pyhoca-cli.spce: fix typo in Python-2-Requires: line: random % char.
---
 debian/changelog | 1 +
 pyhoca-cli.spec  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 905de59b..e8df0eb5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ pyhoca-cli (0.6.1.2-0x2go1) UNRELEASED; urgency=medium
   %bcond_with... XXX macro calls, but have to use them only once with the
   correct value. Hence, use a global variable to store and mangle the
   preferences and only use %bcond_... X later once.
++ Fix typo in Python-2-Requires: line: random % char.
 
  -- X2Go Release Manager   Fri, 22 Nov 2019 15:26:45 +0100
 
diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec
index 2202d199..e6686972 100644
--- a/pyhoca-cli.spec
+++ b/pyhoca-cli.spec
@@ -139,7 +139,7 @@ BuildRequires:  %{name_helper_python2}-devel
 %endif
 BuildRequires:  python-setuptools
 Requires:   python-setproctitle
-Requires:   %{name_helper_python2}-x2go >= 0.6.1.%0
+Requires:   %{name_helper_python2}-x2go >= 0.6.1.0
 %endif
 %if 0%{?with_python3}
 BuildRequires:  %{name_helper_python3}-devel

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 13/25: pyhoca-cli.spec: fix selecting either Python 2 XOR 3.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to annotated tag 0.6.1.2
in repository x2goclient.

commit 1cb84f84cd19cb4cd958d860c291822694045779
Author: Mihai Moldovan 
Date:   Tue Dec 24 03:46:37 2019 +0100

pyhoca-cli.spec: fix selecting either Python 2 XOR 3.

We cannot override bconds via later %bcond_with... XXX macro calls, but
have to use them only once with the correct value.

Hence, use a global variable to store and mangle the preferences and
only use %bcond_... X later once.
---
 debian/changelog |  4 
 pyhoca-cli.spec  | 39 ++-
 2 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d95a7d67..905de59b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,10 @@ pyhoca-cli (0.6.1.2-0x2go1) UNRELEASED; urgency=medium
 + Fix files section on older *SuSE variants.
 + Fix files section on older *SuSE variants again, remove faulty slash.
 + Use %{name} instead of hardcoding the string in %prep.
++ Fix selecting either Python 2 XOR 3. We cannot override bconds via later
+  %bcond_with... XXX macro calls, but have to use them only once with the
+  correct value. Hence, use a global variable to store and mangle the
+  preferences and only use %bcond_... X later once.
 
  -- X2Go Release Manager   Fri, 22 Nov 2019 15:26:45 +0100
 
diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec
index e79bea21..2202d199 100644
--- a/pyhoca-cli.spec
+++ b/pyhoca-cli.spec
@@ -1,23 +1,44 @@
 # Add conditional and ...
+# ... disable by default, mostly for older distros.
+%global want_python3 0
 %if 0%{?suse_version} > 1310 || 0%{?fedora} >= 26 || 0%{?rhel} >= 8
 # ... enable by default on newer distros.
-%bcond_without  python3
-%else
-# ... disable by default on older distros.
-%bcond_with python3
+%global want_python3 1
 %endif
 
 # Fedora 30 deprecated Python 2, 31 disabled support for building these
 # packages.
+%global want_python2 1
 %if 0%{?fedora} >= 31
-%bcond_withpython2
-%else
-%bcond_without python2
+%global want_python2 0
 %endif
 
 # Prefer Python 3 if both variants have been requested.
-%if 0%{?with_python2} && 0%{?with_python3}
-%bcond_with python2
+%if 0%{?want_python2} && 0%{?want_python3}
+%global want_python2 0
+%endif
+
+# Conditional builds are a bit weird.
+# You CAN either enable or disable a feature via %%bcond_with{,out}, BUT you
+# can NOT override this value later on, it seems.
+# Case in point: I tried to use %bcond_without python2 for all older Fedora
+# versions, %bcond_with python3 for all Fedora versions starting with 26.
+# However, as pyhoca-{gui,cli} are just applications, we want to build against
+# one specific python version only, so I later tried to override the Python-2-
+# build via %bcond_with python2, essentially disabling it and preferring the
+# Python-3-based version.
+# This didn't work, since %{?with_python2} was kept enabled.
+# Hence, we'll only enable/disable a feature once now, based upon the global
+# macros.
+%if 0%{?want_python2}
+%bcond_without  python2
+%else
+%bcond_with python2
+%endif
+%if 0%{?want_python3}
+%bcond_without  python3
+%else
+%bcond_with python3
 %endif
 
 # Provide a default implementation, essentially for non-*SuSE platforms.

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 11/25: pyhoca-cli.spec: fix files section on older *SuSE variants again, remove faulty slash.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to annotated tag 0.6.1.2
in repository x2goclient.

commit 669b7c1321a331df0ca655aa560c9de8be0c8134
Author: Mihai Moldovan 
Date:   Thu Dec 19 02:09:35 2019 +0100

pyhoca-cli.spec: fix files section on older *SuSE variants again, remove 
faulty slash.
---
 debian/changelog | 1 +
 pyhoca-cli.spec  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 6848d456..778ff1ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ pyhoca-cli (0.6.1.2-0x2go1) UNRELEASED; urgency=medium
 + Fix building Python 2 variant on older *SuSE variants.
 + Also fix install phase for Python 2 variant on older *SuSE variants.
 + Fix files section on older *SuSE variants.
++ Fix files section on older *SuSE variants again, remove faulty slash.
 
  -- X2Go Release Manager   Fri, 22 Nov 2019 15:26:45 +0100
 
diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec
index 5fdbaa76..ae13cf55 100644
--- a/pyhoca-cli.spec
+++ b/pyhoca-cli.spec
@@ -228,7 +228,7 @@ cp -rp man/* %{buildroot}/%{_mandir}/
 %pycache_only %{python2_sitelib}/__pycache__
 %else
 %{python_sitelib}/pyhoca/
-%{python_sitelib}/PyHoca_CLI*/
+%{python_sitelib}/PyHoca_CLI*
 %endif
 %else
 %{python2_sitelib}/pyhoca/

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 12/25: pyhoca-cli.spec: use %{name} instead of hardcoding the string in %prep.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to annotated tag 0.6.1.2
in repository x2goclient.

commit 5211c8b9439675eec244be161dbc193761794338
Author: Mihai Moldovan 
Date:   Fri Dec 20 10:04:18 2019 +0100

pyhoca-cli.spec: use %{name} instead of hardcoding the string in %prep.
---
 debian/changelog | 1 +
 pyhoca-cli.spec  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 778ff1ab..d95a7d67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ pyhoca-cli (0.6.1.2-0x2go1) UNRELEASED; urgency=medium
 + Also fix install phase for Python 2 variant on older *SuSE variants.
 + Fix files section on older *SuSE variants.
 + Fix files section on older *SuSE variants again, remove faulty slash.
++ Use %{name} instead of hardcoding the string in %prep.
 
  -- X2Go Release Manager   Fri, 22 Nov 2019 15:26:45 +0100
 
diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec
index ae13cf55..e79bea21 100644
--- a/pyhoca-cli.spec
+++ b/pyhoca-cli.spec
@@ -153,10 +153,10 @@ on desktops and thin clients.
 %prep
 %setup -q
 %if 0%{?with_python2}
-sed -i -e '1s@^#/usr/bin/python3@/usr/bin/%{name_helper_python2}@' 'pyhoca-cli'
+sed -i -e '1s@^#/usr/bin/python3@/usr/bin/%{name_helper_python2}@' '%{name}'
 %endif
 %if 0%{?with_python3}
-sed -i -e '1s@^#/usr/bin/python3@/usr/bin/%{name_helper_python3}@' 'pyhoca-cli'
+sed -i -e '1s@^#/usr/bin/python3@/usr/bin/%{name_helper_python3}@' '%{name}'
 %endif
 
 

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 10/25: pyhoca-cli.spec: fix files section on older *SuSE variants.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to annotated tag 0.6.1.2
in repository x2goclient.

commit 28249414669d5d889f04bd8aa4e768b6a08e7f79
Author: Mihai Moldovan 
Date:   Thu Dec 19 01:12:46 2019 +0100

pyhoca-cli.spec: fix files section on older *SuSE variants.
---
 debian/changelog |  1 +
 pyhoca-cli.spec  | 11 +++
 2 files changed, 12 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0f44bead..6848d456 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ pyhoca-cli (0.6.1.2-0x2go1) UNRELEASED; urgency=medium
 + Actually change the hashbang of a file...
 + Fix building Python 2 variant on older *SuSE variants.
 + Also fix install phase for Python 2 variant on older *SuSE variants.
++ Fix files section on older *SuSE variants.
 
  -- X2Go Release Manager   Fri, 22 Nov 2019 15:26:45 +0100
 
diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec
index 0e170ab7..5fdbaa76 100644
--- a/pyhoca-cli.spec
+++ b/pyhoca-cli.spec
@@ -221,9 +221,20 @@ cp -rp man/* %{buildroot}/%{_mandir}/
 %doc COPYING README TODO
 %{_bindir}/%{name}
 %if 0%{?with_python2}
+%if 0%{?suse_version}
+%if ( 0%{?sle_version} && 0%{?sle_version} >= 120300 && 0%{?is_opensuse} ) || 
( 0%{?suse_version} > 1500 )
+%{python2_sitelib}/pyhoca/
+%{python2_sitelib}/PyHoca_CLI*
+%pycache_only %{python2_sitelib}/__pycache__
+%else
+%{python_sitelib}/pyhoca/
+%{python_sitelib}/PyHoca_CLI*/
+%endif
+%else
 %{python2_sitelib}/pyhoca/
 %{python2_sitelib}/PyHoca_CLI*
 %endif
+%endif
 %if 0%{?with_python3}
 %{python3_sitelib}/pyhoca/
 %{python3_sitelib}/PyHoca_CLI*

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 09/25: pyhoca-cli.spec: also fix install phase for Python 2 variant on older *SuSE variants.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to annotated tag 0.6.1.2
in repository x2goclient.

commit 1353f72144948471f5fb043096ceff5aaa4c3411
Author: Mihai Moldovan 
Date:   Wed Dec 18 22:50:38 2019 +0100

pyhoca-cli.spec: also fix install phase for Python 2 variant on older *SuSE 
variants.
---
 debian/changelog | 1 +
 pyhoca-cli.spec  | 8 
 2 files changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index fbd7de7f..0f44bead 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ pyhoca-cli (0.6.1.2-0x2go1) UNRELEASED; urgency=medium
 + Fix syntax error.
 + Actually change the hashbang of a file...
 + Fix building Python 2 variant on older *SuSE variants.
++ Also fix install phase for Python 2 variant on older *SuSE variants.
 
  -- X2Go Release Manager   Fri, 22 Nov 2019 15:26:45 +0100
 
diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec
index 79f726b4..0e170ab7 100644
--- a/pyhoca-cli.spec
+++ b/pyhoca-cli.spec
@@ -186,8 +186,16 @@ python3 setup.py build
 
 %install
 %if 0%{?with_python2}
+%if 0%{?suse_version}
+%if 0%{?sle_version} && ( ( 0%{?sle_version} < 120300 && 0%{?is_opensuse} ) || 
( ! 0%{?is_opensuse} ) )
+python2 setup.py install --skip-build --root %{buildroot}
+%else
+%{python2_install} --skip-build
+%endif
+%else
 %{py2_install}
 %endif
+%endif
 %if 0%{?with_python3}
 %if 0%{?suse_version}
 %if 0%{?sle_version} && ( ( 0%{?sle_version} < 120300 && 0%{?is_opensuse} ) || 
( ! 0%{?is_opensuse} ) )

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 04/25: pyhoca-cli.spec: use %{?with_pythonX} and %{name_helper_pythonX} macros.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to annotated tag 0.6.1.2
in repository x2goclient.

commit 89628dc90c2520872b16db7560e365aa9afa2d6a
Author: Mihai Moldovan 
Date:   Wed Dec 18 20:57:30 2019 +0100

pyhoca-cli.spec: use %{?with_pythonX} and %{name_helper_pythonX} macros.

Also fixes running against nightly versions of python-x2go.
---
 debian/changelog |  2 ++
 pyhoca-cli.spec  | 38 --
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 57953349..670a0933 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ pyhoca-cli (0.6.1.2-0x2go1) UNRELEASED; urgency=medium
 + Backport macros from python-x2go.spec.
 + Prefer Python 3 if both variants have been requested, so that we only
   ever build for one variant.
++ Use %{?with_pythonX} and %{name_helper_pythonX} macros. Also fixes
+  running against nightly versions of python-x2go.
 
  -- X2Go Release Manager   Fri, 22 Nov 2019 15:26:45 +0100
 
diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec
index 171fbfeb..73a07cdc 100644
--- a/pyhoca-cli.spec
+++ b/pyhoca-cli.spec
@@ -107,16 +107,24 @@ URL:http://www.x2go.org/
 Source0:
http://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz
 
 BuildArch:  noarch
-%if 0%{?el6} || 0%{?el7}
+%if 0%{?with_python2}
+%if 0%{?sle_version} && ( ( 0%{?sle_version} < 120300 && 0%{?is_opensuse} ) || 
( ! 0%{?is_opensuse} ) )
+# On some *SuSE versions, we still need python-devel, even though we also 
enable Python 3
+# builds there and consequently should build-depend upon python2-devel... but 
it doesn't
+# exist there.
 BuildRequires:  python-devel
+%else
+BuildRequires:  %{name_helper_python2}-devel
+%endif
 BuildRequires:  python-setuptools
 Requires:   python-setproctitle
-Requires:   python-x2go >= 0.6.1.0
-%else
-BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
-Requires:   python3-setproctitle
-Requires:   python3-x2go >= 0.6.1.0
+Requires:   %{name_helper_python2}-x2go >= 0.6.1.%0
+%endif
+if 0%{?with_python3}
+BuildRequires:  %{name_helper_python3}-devel
+BuildRequires:  %{name_helper_python3}-setuptools
+Requires:   %{name_helper_python3}-setproctitle
+Requires:   %{name_helper_python3}-x2go >= 0.6.1.0
 %endif
 %if 0%{?suse_version}
 BuildRequires:  fdupes
@@ -147,10 +155,10 @@ on desktops and thin clients.
 
 
 %build
-%if 0%{?el6} || 0%{?el7}
-# Make sure we stay on Python 2 on CentOS for the time being. Maybe not for 
EL8.
+%if 0%{?with_python2}
 %{py2_build}
-%else
+%endif
+%if 0%{?with_python3}
 %if 0%{?suse_version}
 %if 0%{?sle_version} && ( ( 0%{?sle_version} < 120300 && 0%{?is_opensuse} ) || 
( ! 0%{?is_opensuse} ) )
 python3 setup.py build
@@ -163,9 +171,10 @@ python3 setup.py build
 %endif
 
 %install
-%if 0%{?el6} || 0%{?el7}
+%if 0%{?with_python2}
 %{py2_install}
-%else
+%endif
+%if 0%{?with_python3}
 %if 0%{?suse_version}
 %if 0%{?sle_version} && ( ( 0%{?sle_version} < 120300 && 0%{?is_opensuse} ) || 
( ! 0%{?is_opensuse} ) )
 python3 setup.py install -O1 --skip-build --prefix %{_prefix} --root 
%{buildroot}
@@ -189,10 +198,11 @@ cp -rp man/* %{buildroot}/%{_mandir}/
 %defattr(-,root,root)
 %doc COPYING README TODO
 %{_bindir}/%{name}
-%if 0%{?el6} || 0%{?el7}
+%if 0%{?with_python2}
 %{python2_sitelib}/pyhoca/
 %{python2_sitelib}/PyHoca_CLI*
-%else
+%endif
+%if 0%{?with_python3}
 %{python3_sitelib}/pyhoca/
 %{python3_sitelib}/PyHoca_CLI*
 %if 0%{?suse_version}

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 07/25: pyhoca-cli.spec: actually change the hashbang of a file...

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to annotated tag 0.6.1.2
in repository x2goclient.

commit 1e6223947360e537ba153d3ade30dcc4e459b08a
Author: Mihai Moldovan 
Date:   Wed Dec 18 21:28:21 2019 +0100

pyhoca-cli.spec: actually change the hashbang of a file...
---
 debian/changelog | 1 +
 pyhoca-cli.spec  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a8eef63a..e036cd6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ pyhoca-cli (0.6.1.2-0x2go1) UNRELEASED; urgency=medium
   running against nightly versions of python-x2go.
 + Replace hashbang with version determined by name helper.
 + Fix syntax error.
++ Actually change the hashbang of a file...
 
  -- X2Go Release Manager   Fri, 22 Nov 2019 15:26:45 +0100
 
diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec
index 8788bc8d..069fba96 100644
--- a/pyhoca-cli.spec
+++ b/pyhoca-cli.spec
@@ -153,10 +153,10 @@ on desktops and thin clients.
 %prep
 %setup -q
 %if 0%{?with_python2}
-sed -i -e '1s@^#/usr/bin/python3@/usr/bin/%{name_helper_python2}@'
+sed -i -e '1s@^#/usr/bin/python3@/usr/bin/%{name_helper_python2}@' 'pyhoca-cli'
 %endif
 %if 0%{?with_python3}
-sed -i -e '1s@^#/usr/bin/python3@/usr/bin/%{name_helper_python3}@'
+sed -i -e '1s@^#/usr/bin/python3@/usr/bin/%{name_helper_python3}@' 'pyhoca-cli'
 %endif
 
 

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 06/25: pyhoca-cli.spec: fix syntax error.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to annotated tag 0.6.1.2
in repository x2goclient.

commit 60753ab932dc80909dcff52106fa0bd7ba90f42f
Author: Mihai Moldovan 
Date:   Wed Dec 18 21:12:19 2019 +0100

pyhoca-cli.spec: fix syntax error.
---
 debian/changelog | 1 +
 pyhoca-cli.spec  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9c878605..a8eef63a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ pyhoca-cli (0.6.1.2-0x2go1) UNRELEASED; urgency=medium
 + Use %{?with_pythonX} and %{name_helper_pythonX} macros. Also fixes
   running against nightly versions of python-x2go.
 + Replace hashbang with version determined by name helper.
++ Fix syntax error.
 
  -- X2Go Release Manager   Fri, 22 Nov 2019 15:26:45 +0100
 
diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec
index b9501f10..8788bc8d 100644
--- a/pyhoca-cli.spec
+++ b/pyhoca-cli.spec
@@ -120,7 +120,7 @@ BuildRequires:  python-setuptools
 Requires:   python-setproctitle
 Requires:   %{name_helper_python2}-x2go >= 0.6.1.%0
 %endif
-if 0%{?with_python3}
+%if 0%{?with_python3}
 BuildRequires:  %{name_helper_python3}-devel
 BuildRequires:  %{name_helper_python3}-setuptools
 Requires:   %{name_helper_python3}-setproctitle

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 08/25: pyhoca-cli.spec: fix building Python 2 variant on older *SuSE variants.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to annotated tag 0.6.1.2
in repository x2goclient.

commit 6262249ae6a84900fca6612483ff072a018165f3
Author: Mihai Moldovan 
Date:   Wed Dec 18 22:13:06 2019 +0100

pyhoca-cli.spec: fix building Python 2 variant on older *SuSE variants.
---
 debian/changelog | 1 +
 pyhoca-cli.spec  | 8 
 2 files changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e036cd6d..fbd7de7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ pyhoca-cli (0.6.1.2-0x2go1) UNRELEASED; urgency=medium
 + Replace hashbang with version determined by name helper.
 + Fix syntax error.
 + Actually change the hashbang of a file...
++ Fix building Python 2 variant on older *SuSE variants.
 
  -- X2Go Release Manager   Fri, 22 Nov 2019 15:26:45 +0100
 
diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec
index 069fba96..79f726b4 100644
--- a/pyhoca-cli.spec
+++ b/pyhoca-cli.spec
@@ -162,8 +162,16 @@ sed -i -e 
'1s@^#/usr/bin/python3@/usr/bin/%{name_helper_python3}@' 'pyhoca-cli'
 
 %build
 %if 0%{?with_python2}
+%if 0%{?suse_version}
+%if 0%{?sle_version} && ( ( 0%{?sle_version} < 120300 && 0%{?is_opensuse} ) || 
( ! 0%{?is_opensuse} ) )
+python2 setup.py build
+%else
+%{python2_build}
+%endif
+%else
 %{py2_build}
 %endif
+%endif
 %if 0%{?with_python3}
 %if 0%{?suse_version}
 %if 0%{?sle_version} && ( ( 0%{?sle_version} < 120300 && 0%{?is_opensuse} ) || 
( ! 0%{?is_opensuse} ) )

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 05/25: pyhoca-cli.spec: replace hashbang with version determined by name helper.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to annotated tag 0.6.1.2
in repository x2goclient.

commit 6f970b8eddfb691c8ac8bfe455b9ad1e4c80dc84
Author: Mihai Moldovan 
Date:   Wed Dec 18 21:02:49 2019 +0100

pyhoca-cli.spec: replace hashbang with version determined by name helper.
---
 debian/changelog | 1 +
 pyhoca-cli.spec  | 6 ++
 2 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 670a0933..9c878605 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ pyhoca-cli (0.6.1.2-0x2go1) UNRELEASED; urgency=medium
   ever build for one variant.
 + Use %{?with_pythonX} and %{name_helper_pythonX} macros. Also fixes
   running against nightly versions of python-x2go.
++ Replace hashbang with version determined by name helper.
 
  -- X2Go Release Manager   Fri, 22 Nov 2019 15:26:45 +0100
 
diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec
index 73a07cdc..b9501f10 100644
--- a/pyhoca-cli.spec
+++ b/pyhoca-cli.spec
@@ -152,6 +152,12 @@ on desktops and thin clients.
 
 %prep
 %setup -q
+%if 0%{?with_python2}
+sed -i -e '1s@^#/usr/bin/python3@/usr/bin/%{name_helper_python2}@'
+%endif
+%if 0%{?with_python3}
+sed -i -e '1s@^#/usr/bin/python3@/usr/bin/%{name_helper_python3}@'
+%endif
 
 
 %build

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-tags] [x2goclient] annotated tag 0.6.1.2 created (now fe679671)

[git-admin]

ew  0d504667  setup.py: we actually also need the version information, 
so import it.
   new  b5d0ec9c  setup.py: need to import the sys module, not just 
version_info into global namespace.
   new  4b69e611  pyhoca-cli.spec: include python2_sitelib for CentOS, 
python3_sitelib otherwise.
   new  1bb1d2a3  pyhoca-cli.spec: pick the files correctly.
   new  14eba70f  pyhoca-cli.spec: also pick files matching PyHoca_CLI* in 
the site-lib directory.
   new  e86021e4  Fix failing password-only authentication.
   new  3fbced2f  pyhoca-cli.spec: fully own %{python2_sitelib}/pyhoca 
directory.
   new  5dcd5633  pyhoca/cli/frontend.py: Check directly after 
authentication, if the remote host has the X2Go Server software installed.
   new  0adac3b8  debian/control: Bump versioned D on python3-x2go to (>= 
0.6.0.2-0~).
   new  7585c679  pyhoca/cli/frontend.py: Be more real-time realistic and 
user friendly with notice log messages after authentication.
   new  192ee99f  pyhoca/cli/frontend.py: rephrase auth success message 
slightly.
   new  20a1cc9a  Catch HOOK_no_such_command and bail out if the server 
does not know how to execute the given session command.
   new  d3987254  misc: copyright update.
   new  755ae8f4  man/man1/pyhoca-cli.1: pre-release date update.
   new  45b662fe  release 0.6.0.1
   new  3078366b  Continue development
   new  e0e66204  Set master session only once we know for sure that the 
session has successfully come up.
   new  bd5faaa8  debian/control: Bump D (pyhoca-cli) on python3-x2go to 
0.6.1.0.
   new  5518cab3  pyhoca-cli.spec: Bump requirement for pyhoca-cli) on 
python(3)-x2go to 0.6.1.0.
   new  aa880ab9  pyhoca/cli/frontend.py: Use Python X2Go's new 
auto-detection code for the graphical proxy/rendering backend (NXv3 vs. KDrive).
   new  64284cc5  release 0.6.1.0
   new  3849938d  Continue development
   new  10804ab0  misc: copyright update.
   new  d7b7d602  release 0.6.1.1
   new  6e5c9bf1  Continue development
   new  d7319594  pyhoca-cli.spec: backport macros from python-x2go.spec.
   new  72f99acd  pyhoca-cli.spec: prefer Python 3 if both variants have 
been requested, so that we only ever build for one variant.
   new  89628dc9  pyhoca-cli.spec: use %{?with_pythonX} and 
%{name_helper_pythonX} macros.
   new  6f970b8e  pyhoca-cli.spec: replace hashbang with version determined 
by name helper.
   new  60753ab9  pyhoca-cli.spec: fix syntax error.
   new  1e622394  pyhoca-cli.spec: actually change the hashbang of a file...
   new  6262249a  pyhoca-cli.spec: fix building Python 2 variant on older 
*SuSE variants.
   new  1353f721  pyhoca-cli.spec: also fix install phase for Python 2 
variant on older *SuSE variants.
   new  28249414  pyhoca-cli.spec: fix files section on older *SuSE 
variants.
   new  669b7c13  pyhoca-cli.spec: fix files section on older *SuSE 
variants again, remove faulty slash.
   new  5211c8b9  pyhoca-cli.spec: use %{name} instead of hardcoding the 
string in %prep.
   new  1cb84f84  pyhoca-cli.spec: fix selecting either Python 2 XOR 3.
   new  7187ae30  pyhoca-cli.spce: fix typo in Python-2-Requires: line: 
random % char.
   new  9e3be654  pyhoca-cli.spec: hopefully fix builds on *SuSE: even pure 
Python-3-builds need python-devel as a build requirement (only)... for some 
weird reason.
   new  6847b62e  Revert "pyhoca-cli.spec: hopefully fix builds on *SuSE: 
even pure Python-3-builds need python-devel as a build requirement (only)... 
for some weird reason."
   new  1acaf619  pyhoca-cli.spec: actually fix issue: macros are expanded 
even in commented lines and some of them were not properly escaped via double 
percent sign characters.
   new  38484b85  pyhoca-cli.spec: fix another unescaped macro in comment.
   new  8cb1e436  pyhoca-cli.spec: fix newer *SuSE versions: 15.0+ seem to 
install the pycace files into a subdirectory based on the package name.
   new  6b7a676a  pyhoca-cli.spec: fix spelling error in pycache directory.
   new  3f39a617  pyhoca-cli.spec: actually apply pycache changes to 15.0+ 
and not just 15.1+.
   new  81dc3491  pyhoca-cli.spec: also apply pycache changes to 
Tumbleweed, which seems to not get caught by %{sle_version}.
   new  a77fa383  debian/changelog: fix version in description.
   new  810ac3e2  man/man1/pyhoca-cli.1: pre-release date update.
   new  071bd72d  release 0.6.1.2

The 336 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-tags mailing list
x2go-tags@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-tags

[X2Go-Commits] [x2goclient] 02/03: misc: copyright update.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to annotated tag 0.6.1.1
in repository x2goclient.

commit 10804ab051f2c0fe62d0da59e88cf5dfb49f6cee
Author: Mihai Moldovan 
Date:   Fri Nov 22 12:50:39 2019 +0100

misc: copyright update.
---
 Makefile.docupload | 2 +-
 README | 2 +-
 TODO   | 2 +-
 debian/changelog   | 4 +++-
 debian/copyright   | 4 ++--
 debian/rules   | 2 +-
 pyhoca-cli | 2 +-
 pyhoca/__init__.py | 2 +-
 pyhoca/cli/__init__.py | 2 +-
 pyhoca/cli/frontend.py | 2 +-
 setup.py   | 2 +-
 11 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Makefile.docupload b/Makefile.docupload
index cfb120e4..fe033a3b 100644
--- a/Makefile.docupload
+++ b/Makefile.docupload
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 # Makefile.docupload file - for pyhoca-cli
-# Copyright 2010-2018 by Mike Gabriel , 
AGPLv3+ applies to this file
+# Copyright 2010-2019 by Mike Gabriel , 
AGPLv3+ applies to this file
 
 VERSION=`head -n1 debian/changelog | sed 's,.*(\(.*\)).*,\1,' | cut -d"-" -f1`
 DOC_HOST=code.x2go.org
diff --git a/README b/README
index 7db850e1..6bdacc6e 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-pyhoca-cli - Copyright (C) 2010-2018 by Mike Gabriel 

+pyhoca-cli - Copyright (C) 2010-2019 by Mike Gabriel 

 
 Contributors:
 2010, Jörg Sawatzki 
diff --git a/TODO b/TODO
index 5c729bdb..d9d83e81 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-pyhoca-cli - Copyright (C) 2010-2018 by Mike Gabriel 

+pyhoca-cli - Copyright (C) 2010-2019 by Mike Gabriel 

 
 Contributors:
 2010, Jörg Sawatzki 
diff --git a/debian/changelog b/debian/changelog
index b74eebc6..d492d78c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 pyhoca-cli (0.6.1.1-0x2go1) UNRELEASED; urgency=medium
 
-  * Continue development
+  [ Mihai Moldovan ]
+  * New upstream version (0.6.1.1):
+- misc: copyright update.
 
  -- X2Go Release Manager   Fri, 22 Nov 2019 11:16:26 +0100
 
diff --git a/debian/copyright b/debian/copyright
index fed61784..c1dc9dcc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,11 +4,11 @@ Upstream-Contact: Mike Gabriel 

 Source: http://wiki.x2go.org
 
 Files: *
-Copyright: 2010-2018, Mike Gabriel 
+Copyright: 2010-2019, Mike Gabriel 
 License: AGPL-3+
 
 Files: debian/*
-Copyright: 2010-2018, Mike Gabriel 
+Copyright: 2010-2019, Mike Gabriel 
 License: AGPL-3+
 
 License: AGPL-3+
diff --git a/debian/rules b/debian/rules
index 41fa4ee2..18bb8604 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 # debian/rules file - for pyhoca-cli
 # Based on sample debian/rules file - for GNU Hello (1.3).
-# Copyright 2010-2018 by Mike Gabriel 
+# Copyright 2010-2019 by Mike Gabriel 
 
 %:
dh ${@} --with=python3 --buildsystem=pybuild
diff --git a/pyhoca-cli b/pyhoca-cli
index a097ae53..7dd9001a 100755
--- a/pyhoca-cli
+++ b/pyhoca-cli
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2018 by Mike Gabriel 
+# Copyright (C) 2010-2019 by Mike Gabriel 
 #
 # PyHoca CLI is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/pyhoca/__init__.py b/pyhoca/__init__.py
index 3576f8d4..aa62d235 100644
--- a/pyhoca/__init__.py
+++ b/pyhoca/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2018 by Mike Gabriel 
+# Copyright (C) 2010-2019 by Mike Gabriel 
 #
 # PyHoca CLI is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/pyhoca/cli/__init__.py b/pyhoca/cli/__init__.py
index c963cfb9..e4446d5f 100644
--- a/pyhoca/cli/__init__.py
+++ b/pyhoca/cli/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2016 by Mike Gabriel 
+# Copyright (C) 2010-2019 by Mike Gabriel 
 #
 # PyHoca CLI is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py
index 80921df7..e970dcac 100644
--- a/pyhoca/cli/frontend.py
+++ b/pyhoca/cli/frontend.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2018 by Mike Gabriel 
+# Copyright (C) 2010-2019 by Mike Gabriel 
 #
 # PyHoca CLI is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/setup.py b/setup.py
index 8b3d44d6..eb20cc9b 100755
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2018 by Mike Gabriel 
+# Copyright (C) 2010-2019 by Mike Gabriel 
 #
 # PyHoca is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

--
Alioth's /home/

[X2Go-Commits] [x2goclient] 03/03: release 0.6.1.1

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to annotated tag 0.6.1.1
in repository x2goclient.

commit d7b7d602283d0ce37bce2a4a5094f430276ec0a6
Author: X2Go Release Manager 
Date:   Fri Nov 22 14:11:53 2019 +0100

release 0.6.1.1
---
 ChangeLog| 10 +-
 debian/changelog |  4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8312c21e..2b0754ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
-2019-11-20 08:12:07 +0100 Mike Gabriel (1f677fe)
+2019-11-22 12:50:39 +0100 Mihai Moldovan
+
+   * misc: copyright update. (HEAD -> master)
+
+2019-11-22 11:18:30 +0100 X2Go Release Manager (3849938)
+
+   * Continue development
+
+2019-11-20 08:12:07 +0100 Mike Gabriel (64284cc)
 
* release 0.6.1.0 (HEAD -> master, tag: 0.6.1.0)
 
diff --git a/debian/changelog b/debian/changelog
index d492d78c..9a67eeda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-pyhoca-cli (0.6.1.1-0x2go1) UNRELEASED; urgency=medium
+pyhoca-cli (0.6.1.1-0x2go1) unstable; urgency=medium
 
   [ Mihai Moldovan ]
   * New upstream version (0.6.1.1):
 - misc: copyright update.
 
- -- X2Go Release Manager   Fri, 22 Nov 2019 11:16:26 +0100
+ -- X2Go Release Manager   Fri, 22 Nov 2019 14:02:30 +0100
 
 pyhoca-cli (0.6.1.0-0x2go1) unstable; urgency=medium
 

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 01/25: Continue development

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to annotated tag 0.6.1.2
in repository x2goclient.

commit 6e5c9bf19c625873e6d0018b3cc2e4d76a2597dd
Author: X2Go Release Manager 
Date:   Fri Nov 22 15:27:43 2019 +0100

Continue development
---
 debian/changelog   | 6 ++
 man/man1/pyhoca-cli.1  | 2 +-
 pyhoca-cli.spec| 2 +-
 pyhoca/cli/__init__.py | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9a67eeda..885e6b56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pyhoca-cli (0.6.1.2-0x2go1) UNRELEASED; urgency=medium
+
+  * Continue development
+
+ -- X2Go Release Manager   Fri, 22 Nov 2019 15:26:45 +0100
+
 pyhoca-cli (0.6.1.1-0x2go1) unstable; urgency=medium
 
   [ Mihai Moldovan ]
diff --git a/man/man1/pyhoca-cli.1 b/man/man1/pyhoca-cli.1
index 7995d041..c3580f79 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 "Nov 2019" "Version 0.6.1.1" "X2Go Application"
+.TH pyhoca-cli 1 "Nov 2019" "Version 0.6.1.2" "X2Go Application"
 .SH NAME
 pyhoca-cli \- X2Go command line client written in Python
 .SH SYNOPSIS
diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec
index 0d5f549f..a5426402 100644
--- a/pyhoca-cli.spec
+++ b/pyhoca-cli.spec
@@ -1,5 +1,5 @@
 Name:   pyhoca-cli
-Version:0.6.1.1
+Version:0.6.1.2
 Release:0.0x2go1%{?dist}
 Summary:Command line X2Go client written in Python
 
diff --git a/pyhoca/cli/__init__.py b/pyhoca/cli/__init__.py
index e4446d5f..7f1dafdd 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.6.1.1"
+__VERSION__ = "0.6.1.2"
 
 from .frontend import *

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 01/03: Continue development

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to annotated tag 0.6.1.1
in repository x2goclient.

commit 3849938d739e309e320d947bcb4f84c4ee57ac29
Author: X2Go Release Manager 
Date:   Fri Nov 22 11:18:30 2019 +0100

Continue development
---
 debian/changelog   | 6 ++
 man/man1/pyhoca-cli.1  | 2 +-
 pyhoca-cli.spec| 2 +-
 pyhoca/cli/__init__.py | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index db20edf4..b74eebc6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pyhoca-cli (0.6.1.1-0x2go1) UNRELEASED; urgency=medium
+
+  * Continue development
+
+ -- X2Go Release Manager   Fri, 22 Nov 2019 11:16:26 +0100
+
 pyhoca-cli (0.6.1.0-0x2go1) unstable; urgency=medium
 
   [ Mike Gabriel ]
diff --git a/man/man1/pyhoca-cli.1 b/man/man1/pyhoca-cli.1
index ae3a2add..7995d041 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 "Nov 2019" "Version 0.6.1.0" "X2Go Application"
+.TH pyhoca-cli 1 "Nov 2019" "Version 0.6.1.1" "X2Go Application"
 .SH NAME
 pyhoca-cli \- X2Go command line client written in Python
 .SH SYNOPSIS
diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec
index 2265e5bd..0d5f549f 100644
--- a/pyhoca-cli.spec
+++ b/pyhoca-cli.spec
@@ -1,5 +1,5 @@
 Name:   pyhoca-cli
-Version:0.6.1.0
+Version:0.6.1.1
 Release:0.0x2go1%{?dist}
 Summary:Command line X2Go client written in Python
 
diff --git a/pyhoca/cli/__init__.py b/pyhoca/cli/__init__.py
index 37304ac7..c963cfb9 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.6.1.0"
+__VERSION__ = "0.6.1.1"
 
 from .frontend import *

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 93/94: pyhoca/cli/frontend.py: Use Python X2Go's new auto-detection code for the graphical proxy/rendering backend (NXv3 vs. KDrive).

[git-admin]

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 aa880ab96f3cdc68dab938febf22df90824274ee
Author: Mike Gabriel 
Date:   Fri Jul 19 19:47:58 2019 +0200

pyhoca/cli/frontend.py: Use Python X2Go's new auto-detection code for the 
graphical proxy/rendering backend (NXv3 vs. KDrive).
---
 debian/changelog   | 2 ++
 pyhoca/cli/frontend.py | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 63f43c8c..bafe1647 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ pyhoca-cli (0.6.0.2-0x2go1) UNRELEASED; urgency=medium
   * New upstream version (0.6.0.3):
 - Set master session only once we know for sure that the
   session has successfully come up.
+- pyhoca/cli/frontend.py: Use Python X2Go's new auto-detection code
+  for the graphical proxy/rendering backend (NXv3 vs. KDrive).
   * debian/control:
 + Bump D (pyhoca-cli) on python3-x2go to 0.6.1.0.
   * pyhoca-cli.spec:
diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py
index f6fbdbab..80921df7 100644
--- a/pyhoca/cli/frontend.py
+++ b/pyhoca/cli/frontend.py
@@ -365,6 +365,8 @@ class PyHocaCLI(x2go.X2GoClient):
 _backend_kwargs['list_backend'] = 
self.args.backend_serversessionlist
 if self.args.backend_proxy is not None:
 _backend_kwargs['proxy_backend'] = self.args.backend_proxy
+else:
+_backend_kwargs['proxy_backend'] = 'auto-detect'
 if self.args.backend_sessionprofiles is not None:
 _backend_kwargs['profiles_backend'] = 
self.args.backend_sessionprofiles
 if self.args.backend_clientsettings is not None:

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-tags] [x2goclient] annotated tag 0.6.1.1 created (now 2aadb0db)

[git-admin]

ease 0.6.1.1

The 311 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-tags mailing list
x2go-tags@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-tags

[X2Go-Commits] [x2goclient] 90/94: Set master session only once we know for sure that the session has successfully come up.

[git-admin]

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 e0e662042e1f3b012c5bada733110cd363020fbf
Author: Mike Gabriel 
Date:   Fri Jul 19 19:02:00 2019 +0200

Set master session only once we know for sure that the session has 
successfully come up.
---
 debian/changelog   | 5 -
 pyhoca/cli/frontend.py | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4f266017..f3754108 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 pyhoca-cli (0.6.0.2-0x2go1) UNRELEASED; urgency=medium
 
-  * Continue development
+  [ Mike Gabriel ]
+  * New upstream version (0.6.0.3):
+- Set master session only once we know for sure that the
+  session has successfully come up.
 
  -- X2Go Release Manager   Mon, 03 Dec 2018 04:49:29 +0100
 
diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py
index fb68379c..f6fbdbab 100644
--- a/pyhoca/cli/frontend.py
+++ b/pyhoca/cli/frontend.py
@@ -723,10 +723,10 @@ class PyHocaCLI(x2go.X2GoClient):
 i+=1
 
 session = self._X2GoClient__get_session(self.x2go_session_hash)
-session.set_master_session()
 
 if self._X2GoClient__session_ok(self.x2go_session_hash):
 
+session.set_master_session()
 profile_name = 
self._X2GoClient__get_session_profile_name(self.x2go_session_hash)
 session_name = 
self._X2GoClient__get_session_name(self.x2go_session_hash)
 self._pyhoca_logger("X2Go session is now running, the X2Go 
client's profile name is: %s" % profile_name, loglevel=x2go.loglevel_INFO, )

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 91/94: debian/control: Bump D (pyhoca-cli) on python3-x2go to 0.6.1.0.

[git-admin]

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 bd5faaa8644bac74a64eecc3b696d1379246bfae
Author: Mike Gabriel 
Date:   Fri Jul 19 19:46:05 2019 +0200

debian/control: Bump D (pyhoca-cli) on python3-x2go to 0.6.1.0.
---
 debian/changelog | 2 ++
 debian/control   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f3754108..cf5827f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ pyhoca-cli (0.6.0.2-0x2go1) UNRELEASED; urgency=medium
   * New upstream version (0.6.0.3):
 - Set master session only once we know for sure that the
   session has successfully come up.
+  * debian/control:
++ Bump D (pyhoca-cli) on python3-x2go to 0.6.1.0.
 
  -- X2Go Release Manager   Mon, 03 Dec 2018 04:49:29 +0100
 
diff --git a/debian/control b/debian/control
index ac9c0381..899fc923 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Depends:
  ${misc:Depends},
  ${python3:Depends},
  python3,
- python3-x2go (>=0.6.0.2-0~),
+ python3-x2go (>=0.6.1.0-0~),
  python3-setproctitle,
 Suggests:
  mteleplayer-clientside,

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 88/94: release 0.6.0.1

[git-admin]

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 45b662feb6c3532039f32dcc113a6ab070e1bbe9
Author: X2Go Release Manager 
Date:   Mon Dec 3 02:22:19 2018 +0100

release 0.6.0.1
---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 80aa81bb..eada84c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium
+pyhoca-cli (0.6.0.1-0x2go1) unstable; urgency=medium
 
   [ Mike Gabriel ]
   * New upstream release (0.6.0.1):
@@ -36,7 +36,7 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium
 - Fully own %{python2_sitelib}/pyhoca directory. Not great, as explained
   in pyhoca-gui, but necessary to make packaging easier.
 
- -- Mike Gabriel   Wed, 19 Sep 2018 15:20:43 
+0200
+ -- X2Go Release Manager   Mon, 03 Dec 2018 02:20:32 +0100
 
 pyhoca-cli (0.6.0.0-0x2go1) unstable; urgency=medium
 

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 89/94: Continue development

[git-admin]

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 3078366bee420f4be2a9177fb91889152abd2322
Author: X2Go Release Manager 
Date:   Mon Dec 3 04:51:13 2018 +0100

Continue development
---
 debian/changelog   | 6 ++
 man/man1/pyhoca-cli.1  | 2 +-
 pyhoca-cli.spec| 2 +-
 pyhoca/cli/__init__.py | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eada84c7..4f266017 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pyhoca-cli (0.6.0.2-0x2go1) UNRELEASED; urgency=medium
+
+  * Continue development
+
+ -- X2Go Release Manager   Mon, 03 Dec 2018 04:49:29 +0100
+
 pyhoca-cli (0.6.0.1-0x2go1) unstable; urgency=medium
 
   [ Mike Gabriel ]
diff --git a/man/man1/pyhoca-cli.1 b/man/man1/pyhoca-cli.1
index 70afbdae..4f349627 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 "Dec 2018" "Version 0.6.0.1" "X2Go Application"
+.TH pyhoca-cli 1 "Dec 2018" "Version 0.6.0.2" "X2Go Application"
 .SH NAME
 pyhoca-cli \- X2Go command line client written in Python
 .SH SYNOPSIS
diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec
index 421b0041..9d3ffe4d 100644
--- a/pyhoca-cli.spec
+++ b/pyhoca-cli.spec
@@ -1,5 +1,5 @@
 Name:   pyhoca-cli
-Version:0.6.0.1
+Version:0.6.0.2
 Release:0.0x2go1%{?dist}
 Summary:Command line X2Go client written in Python
 
diff --git a/pyhoca/cli/__init__.py b/pyhoca/cli/__init__.py
index dd442a93..2ca021ed 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.6.0.1"
+__VERSION__ = "0.6.0.2"
 
 from .frontend import *

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 92/94: pyhoca-cli.spec: Bump requirement for pyhoca-cli) on python(3)-x2go to 0.6.1.0.

[git-admin]

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 5518cab34db44168138af9a1f467b0c8743b06ca
Author: Mike Gabriel 
Date:   Fri Jul 19 19:47:06 2019 +0200

pyhoca-cli.spec: Bump requirement for pyhoca-cli) on python(3)-x2go to 
0.6.1.0.
---
 debian/changelog | 2 ++
 pyhoca-cli.spec  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cf5827f2..63f43c8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ pyhoca-cli (0.6.0.2-0x2go1) UNRELEASED; urgency=medium
   session has successfully come up.
   * debian/control:
 + Bump D (pyhoca-cli) on python3-x2go to 0.6.1.0.
+  * pyhoca-cli.spec:
++ Bump requirement for pyhoca-cli) on python(3)-x2go to 0.6.1.0.
 
  -- X2Go Release Manager   Mon, 03 Dec 2018 04:49:29 +0100
 
diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec
index 9d3ffe4d..b83aa06f 100644
--- a/pyhoca-cli.spec
+++ b/pyhoca-cli.spec
@@ -17,12 +17,12 @@ BuildArch:  noarch
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
 Requires:   python-setproctitle
-Requires:   python-x2go >= 0.6.0.1
+Requires:   python-x2go >= 0.6.1.0
 %else
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 Requires:   python3-setproctitle
-Requires:   python3-x2go >= 0.6.0.1
+Requires:   python3-x2go >= 0.6.1.0
 %endif
 %if 0%{?suse_version}
 BuildRequires:  fdupes

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 94/94: release 0.6.1.0

[git-admin]

018-09-19 15:16:55 +0200 Mike Gabriel (3ba796c)
+
+   * debian/control: Set Section: from "python" to "x11". More
+  appropriate.
+
+2018-09-18 21:17:06 +0200 Mike Gabriel (db47d5d)
+
+   * release 0.6.0.0 (tag: 0.6.0.0)
 
 2018-09-18 21:07:26 +0200 Mike Gabriel (2a3460f)
 
diff --git a/debian/changelog b/debian/changelog
index bafe1647..db20edf4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
-pyhoca-cli (0.6.0.2-0x2go1) UNRELEASED; urgency=medium
+pyhoca-cli (0.6.1.0-0x2go1) unstable; urgency=medium
 
   [ Mike Gabriel ]
-  * New upstream version (0.6.0.3):
+  * New upstream version (0.6.1.0):
 - Set master session only once we know for sure that the
   session has successfully come up.
 - pyhoca/cli/frontend.py: Use Python X2Go's new auto-detection code
@@ -11,7 +11,7 @@ pyhoca-cli (0.6.0.2-0x2go1) UNRELEASED; urgency=medium
   * pyhoca-cli.spec:
 + Bump requirement for pyhoca-cli) on python(3)-x2go to 0.6.1.0.
 
- -- X2Go Release Manager   Mon, 03 Dec 2018 04:49:29 +0100
+ -- Mike Gabriel   Wed, 20 Nov 2019 08:10:52 
+0100
 
 pyhoca-cli (0.6.0.1-0x2go1) unstable; urgency=medium
 
diff --git a/man/man1/pyhoca-cli.1 b/man/man1/pyhoca-cli.1
index 4f349627..ae3a2add 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 "Dec 2018" "Version 0.6.0.2" "X2Go Application"
+.TH pyhoca-cli 1 "Nov 2019" "Version 0.6.1.0" "X2Go Application"
 .SH NAME
 pyhoca-cli \- X2Go command line client written in Python
 .SH SYNOPSIS
diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec
index b83aa06f..2265e5bd 100644
--- a/pyhoca-cli.spec
+++ b/pyhoca-cli.spec
@@ -1,5 +1,5 @@
 Name:   pyhoca-cli
-Version:0.6.0.2
+Version:0.6.1.0
 Release:0.0x2go1%{?dist}
 Summary:Command line X2Go client written in Python
 
diff --git a/pyhoca/cli/__init__.py b/pyhoca/cli/__init__.py
index 2ca021ed..37304ac7 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.6.0.2"
+__VERSION__ = "0.6.1.0"
 
 from .frontend import *

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 87/94: man/man1/pyhoca-cli.1: pre-release date update.

[git-admin]

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 755ae8f4596eb206b1f7b287758362a484bdfbe8
Author: Mihai Moldovan 
Date:   Mon Dec 3 01:20:46 2018 +0100

man/man1/pyhoca-cli.1: pre-release date update.
---
 debian/changelog  | 1 +
 man/man1/pyhoca-cli.1 | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index cb660b3c..80aa81bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium
 - setup.py: need to import the sys module, not just version_info into
   global namespace.
 - misc: copyright update.
+- man/man1/pyhoca-cli.1: pre-release date update.
   * pyhoca-cli.spec:
 - Build with Python 2 on CentOS, drop python3-argparse
   dependency (part of stdlib).
diff --git a/man/man1/pyhoca-cli.1 b/man/man1/pyhoca-cli.1
index 72dfe617..70afbdae 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 2018" "Version 0.6.0.1" "X2Go Application"
+.TH pyhoca-cli 1 "Dec 2018" "Version 0.6.0.1" "X2Go Application"
 .SH NAME
 pyhoca-cli \- X2Go command line client written in Python
 .SH SYNOPSIS

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 72/94: setup.py: backport Python 2 support via io.open.

[git-admin]

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 4f98092b4f933d4facfe26e1be9f5e19be6b256b
Author: Mihai Moldovan 
Date:   Sat Nov 10 13:35:57 2018 +0100

setup.py: backport Python 2 support via io.open.
---
 debian/changelog | 1 +
 setup.py | 6 ++
 2 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4f98e359..087f1d21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium
 
   [ Mihai Moldovan ]
   * New upstream version (0.6.0.1):
+- setup.py: backport Python 2 support via io.open.
   * pyhoca-cli.spec:
 - Build with Python 2 on CentOS, drop python3-argparse
   dependency (part of stdlib).
diff --git a/setup.py b/setup.py
index 6376de78..878e68b6 100755
--- a/setup.py
+++ b/setup.py
@@ -22,6 +22,12 @@ import os
 
 from setuptools import setup
 
+# Specifying file encoding at open time only works with Python 3 directly,
+# but Python >2.6 has some support for this in the IO module.
+# It's said to be slow, but we can live with that.
+if sys.version_info[0] < 3:
+from io import open
+
 __VERSION__ = "0.0.0.0"
 for line in open(os.path.join('pyhoca', 'cli', 
'__init__.py'),encoding='utf-8').readlines():
 if (line.startswith('__VERSION__')):

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 85/94: Catch HOOK_no_such_command and bail out if the server does not know how to execute the given session command.

[git-admin]

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 20a1cc9a222004386f38a23684cfac132ce7ea5d
Author: Mike Gabriel 
Date:   Sat Dec 1 11:57:31 2018 +0100

Catch HOOK_no_such_command and bail out if the server does not know how to 
execute the given session command.
---
 debian/changelog   | 2 ++
 pyhoca/cli/frontend.py | 8 
 2 files changed, 10 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index cfc2c173..0141ac62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium
 - pyhoca/cli/frontend.py: Be more real-time realistic and user friendly
   with notice log messages after authentication.
 - pyhoca/cli/frontend.py: rephrase auth success message slightly.
+- Catch HOOK_no_such_command and bail out if the server does not
+  know how to execute the given session command.
   * debian/control:
 + Set Section: from "python" to "x11". More appropriate.
 + Bump versioned D on python3-x2go to (0.6.0.2-0~).
diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py
index 483c2d4d..072c915c 100644
--- a/pyhoca/cli/frontend.py
+++ b/pyhoca/cli/frontend.py
@@ -69,6 +69,14 @@ class PyHocaCLI(x2go.X2GoClient):
 def _runtime_error(self, m, exitcode=-1):
 runtime_error(m, exitcode=exitcode)
 
+def HOOK_no_such_command(self, *args, **kwargs):
+x2go.X2GoClient.HOOK_no_such_command(self, *args, **kwargs)
+if len(args) == 0:
+cmd=kwargs['cmd']
+else:
+cmd=args[0]
+self._runtime_error("The remote X2Go Server does not know how to 
execute the command '{cmd}'. Aborting...".format(cmd=cmd))
+
 def list_sessions(self, s_hash):
 """\
 List up server-side available sessions for the logged in user.

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 82/94: debian/control: Bump versioned D on python3-x2go to (>= 0.6.0.2-0~).

[git-admin]

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 0adac3b85958b87545a0be70edc45ebafeb2d8e4
Author: Mike Gabriel 
Date:   Sat Nov 10 22:06:27 2018 +

debian/control: Bump versioned D on python3-x2go to (>= 0.6.0.2-0~).
---
 debian/changelog | 1 +
 debian/control   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 58607d2f..a0e36f30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium
   remote host has the X2Go Server software installed.
   * debian/control:
 + Set Section: from "python" to "x11". More appropriate.
++ Bump versioned D on python3-x2go to (0.6.0.2-0~).
 
   [ Mihai Moldovan ]
   * New upstream version (0.6.0.1):
diff --git a/debian/control b/debian/control
index e78ff0c6..ac9c0381 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Depends:
  ${misc:Depends},
  ${python3:Depends},
  python3,
- python3-x2go (>=0.6.0.1-0~),
+ python3-x2go (>=0.6.0.2-0~),
  python3-setproctitle,
 Suggests:
  mteleplayer-clientside,

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 75/94: setup.py: need to import the sys module, not just version_info into global namespace.

[git-admin]

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 b5d0ec9c0de36ee76fc38f7b38626b12da103e8d
Author: Mihai Moldovan 
Date:   Sat Nov 10 13:54:55 2018 +0100

setup.py: need to import the sys module, not just version_info into global 
namespace.
---
 debian/changelog | 2 ++
 setup.py | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 764f8729..8a7998db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium
   * New upstream version (0.6.0.1):
 - setup.py: backport Python 2 support via io.open.
 - setup.py: we actually also need the version information, so import it.
+- setup.py: need to import the sys module, not just version_info into
+  global namespace.
   * pyhoca-cli.spec:
 - Build with Python 2 on CentOS, drop python3-argparse
   dependency (part of stdlib).
diff --git a/setup.py b/setup.py
index 05507ff1..b30d8e6e 100755
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,7 @@
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
 import os
-from sys import version_info
+import sys
 
 from setuptools import setup
 

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 77/94: pyhoca-cli.spec: pick the files correctly.

[git-admin]

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 1bb1d2a3da3e66b705423824970a06f2b2e85f15
Author: Mihai Moldovan 
Date:   Sat Nov 10 15:14:59 2018 +0100

pyhoca-cli.spec: pick the files correctly.
---
 debian/changelog | 1 +
 pyhoca-cli.spec  | 6 --
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 80f5d759..211776fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium
 - Build-Require python-rpm-macros for OpenSuSE builds.
 - Include python2_sitelib for CentOS, python3_sitelib otherwise. Comment
   out for now to let builds fail and get a file list.
+- Pick the files correctly.
 
  -- Mike Gabriel   Wed, 19 Sep 2018 15:20:43 
+0200
 
diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec
index 57d08cbd..3afbc59c 100644
--- a/pyhoca-cli.spec
+++ b/pyhoca-cli.spec
@@ -96,9 +96,11 @@ cp -rp man/* %{buildroot}/%{_mandir}/
 %doc COPYING README TODO
 %{_bindir}/%{name}
 %if 0%{?el6} || 0%{?el7}
-#%%{python2_sitelib}/
+%{python2_sitelib}/pyhoca/cli/
+%{python2_sitelib}/PyHoca_CLI*/
 %else
-#%%{python3_sitelib}/*
+%{python3_sitelib}/pyhoca/cli/
+%{python3_sitelib}/PyHoca_CLI*/
 %if 0%{?suse_version}
 %if ( 0%{?sle_version} && 0%{?sle_version} >= 120300 && 0%{?is_opensuse} ) || 
( 0%{?suse_version} > 1500 )
 %pycache_only %{python3_sitelib}/__pycache__

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 81/94: pyhoca/cli/frontend.py: Check directly after authentication, if the remote host has the X2Go Server software installed.

[git-admin]

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 5dcd5633dfa55ba9e8ae66a8045f7371108e3864
Author: Mike Gabriel 
Date:   Sat Nov 10 22:05:17 2018 +

pyhoca/cli/frontend.py: Check directly after authentication, if the remote 
host has the X2Go Server software installed.
---
 debian/changelog   | 2 ++
 pyhoca/cli/frontend.py | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3578f841..58607d2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium
   [ Mike Gabriel ]
   * New upstream release (0.6.0.1):
 - Fix failing password-only authentication.
+- pyhoca/cli/frontend.py: Check directly after authentication, if the
+  remote host has the X2Go Server software installed.
   * debian/control:
 + Set Section: from "python" to "x11". More appropriate.
 
diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py
index 76ad7624..411045af 100644
--- a/pyhoca/cli/frontend.py
+++ b/pyhoca/cli/frontend.py
@@ -653,6 +653,9 @@ class PyHocaCLI(x2go.X2GoClient):
 password = None
 passphrase = None
 
+if not self.is_x2goserver(self.x2go_session_hash):
+self._runtime_error('the remote server does not have the X2Go 
Server software installed', exitcode=1337)
+
 def MainLoop(self):
 """\
 Start the main loop of this application.

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 79/94: Fix failing password-only authentication.

[git-admin]

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 e86021e4a2a032e31b9fd8d65c894c8989856d30
Author: Mike Gabriel 
Date:   Sat Nov 10 16:05:59 2018 +

Fix failing password-only authentication.
---
 debian/changelog   |  2 +-
 pyhoca/cli/frontend.py | 14 +++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 790599b4..2d1e459f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium
 
   [ Mike Gabriel ]
   * New upstream release (0.6.0.1):
-- Continue development...
+- Fix failing password-only authentication.
   * debian/control:
 + Set Section: from "python" to "x11". More appropriate.
 
diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py
index 01732cfc..76ad7624 100644
--- a/pyhoca/cli/frontend.py
+++ b/pyhoca/cli/frontend.py
@@ -547,6 +547,8 @@ class PyHocaCLI(x2go.X2GoClient):
 force_password_auth = True
 password = None
 passphrase = None
+_auth_count += 1
+continue
 
 except x2go.AuthenticationException as e:
 
@@ -594,6 +596,7 @@ class PyHocaCLI(x2go.X2GoClient):
 # this error gets thrown when the passphrase for 
unlocking the SSH privkey was wrong
 
 if not force_password_auth and 
passphrase_unlock_counter >= 1:
+
 if passphrase is not None and passphrase != '':
 self._pyhoca_logger('wrong SSH key passphrase 
(%s), try again...' % self.args.ssh_privkey, loglevel=x2go.loglevel_WARN, )
 self._pyhoca_logger('unlock SSH key file (%s)' % 
self.args.ssh_privkey, loglevel=x2go.loglevel_NOTICE, )
@@ -604,18 +607,22 @@ class PyHocaCLI(x2go.X2GoClient):
 continue
 
 if not force_password_auth and _auth_count >= 1:
+
 self._pyhoca_logger('unlocking of SSH key failed, 
proceeding with interactive login', loglevel=x2go.loglevel_WARN, )
 force_password_auth = True
 password = None
 passphrase = None
+_auth_count += 1
+continue
 
-elif not str(e).lower().startswith('not a valid dsa 
private key file') or \
- not str(e).lower().startswith('not a valid rsa 
private key file') or \
- not str(e).lower().startswith('incompatible ssh peer 
(no acceptable kex algorithm)') or  \
+elif not str(e).lower().startswith('not a valid dsa 
private key file') and\
+ not str(e).lower().startswith('not a valid rsa 
private key file') and\
+ not str(e).lower().startswith('incompatible ssh peer 
(no acceptable kex algorithm)') and \
  not str(e).lower().startswith('no authentication 
methods available') \
 :
 
 if force_password_auth:
+
 self._pyhoca_logger('password based login for 
,,%s\'\' failed [SSHException]' % _username, loglevel=x2go.loglevel_WARN, )
 else:
 self._pyhoca_logger('passwordless login for 
,,%s\'\' failed [SSHException]' % _username, loglevel=x2go.loglevel_WARN, )
@@ -630,6 +637,7 @@ class PyHocaCLI(x2go.X2GoClient):
 force_password_auth = True
 password = None
 passphrase = None
+_auth_count += 1
 
 if not connected and _auth_count <= 0:
 if self.auth_attempts >= 2:

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 74/94: setup.py: we actually also need the version information, so import it.

[git-admin]

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 0d50466707deb8336ac8cd483cd69e7f65927eeb
Author: Mihai Moldovan 
Date:   Sat Nov 10 13:47:11 2018 +0100

setup.py: we actually also need the version information, so import it.
---
 debian/changelog | 1 +
 setup.py | 1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 28d16cbd..764f8729 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium
   [ Mihai Moldovan ]
   * New upstream version (0.6.0.1):
 - setup.py: backport Python 2 support via io.open.
+- setup.py: we actually also need the version information, so import it.
   * pyhoca-cli.spec:
 - Build with Python 2 on CentOS, drop python3-argparse
   dependency (part of stdlib).
diff --git a/setup.py b/setup.py
index 878e68b6..05507ff1 100755
--- a/setup.py
+++ b/setup.py
@@ -19,6 +19,7 @@
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
 import os
+from sys import version_info
 
 from setuptools import setup
 

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 80/94: pyhoca-cli.spec: fully own %{python2_sitelib}/pyhoca directory.

[git-admin]

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 3fbced2fc6147ebe6d8e2ac216689330723cfb0c
Author: Mihai Moldovan 
Date:   Sun Nov 11 11:27:38 2018 +0100

pyhoca-cli.spec: fully own %{python2_sitelib}/pyhoca directory.

Not great, as explained in pyhoca-gui, but necessary to make packaging 
easier.
---
 debian/changelog | 2 ++
 pyhoca-cli.spec  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2d1e459f..3578f841 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium
   out for now to let builds fail and get a file list.
 - Pick the files correctly.
 - Also pick files matching PyHoca_CLI* in the site-lib directory.
+- Fully own %{python2_sitelib}/pyhoca directory. Not great, as explained
+  in pyhoca-gui, but necessary to make packaging easier.
 
  -- Mike Gabriel   Wed, 19 Sep 2018 15:20:43 
+0200
 
diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec
index c83680da..421b0041 100644
--- a/pyhoca-cli.spec
+++ b/pyhoca-cli.spec
@@ -96,10 +96,10 @@ cp -rp man/* %{buildroot}/%{_mandir}/
 %doc COPYING README TODO
 %{_bindir}/%{name}
 %if 0%{?el6} || 0%{?el7}
-%{python2_sitelib}/pyhoca/cli/
+%{python2_sitelib}/pyhoca/
 %{python2_sitelib}/PyHoca_CLI*
 %else
-%{python3_sitelib}/pyhoca/cli/
+%{python3_sitelib}/pyhoca/
 %{python3_sitelib}/PyHoca_CLI*
 %if 0%{?suse_version}
 %if ( 0%{?sle_version} && 0%{?sle_version} >= 120300 && 0%{?is_opensuse} ) || 
( 0%{?suse_version} > 1500 )

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 83/94: pyhoca/cli/frontend.py: Be more real-time realistic and user friendly with notice log messages after authentication.

[git-admin]

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 7585c67979a790ca344a57369b2c56501e25c88c
Author: Mike Gabriel 
Date:   Mon Nov 26 10:28:59 2018 +0100

pyhoca/cli/frontend.py: Be more real-time realistic and user friendly with 
notice log messages after authentication.
---
 debian/changelog   |  2 ++
 pyhoca/cli/frontend.py | 10 ++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a0e36f30..d3212d20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium
 - Fix failing password-only authentication.
 - pyhoca/cli/frontend.py: Check directly after authentication, if the
   remote host has the X2Go Server software installed.
+- pyhoca/cli/frontend.py: Be more real-time realistic and user friendly
+  with notice log messages after authentication.
   * debian/control:
 + Set Section: from "python" to "x11". More appropriate.
 + Bump versioned D on python3-x2go to (0.6.0.2-0~).
diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py
index 411045af..151ec37a 100644
--- a/pyhoca/cli/frontend.py
+++ b/pyhoca/cli/frontend.py
@@ -656,6 +656,9 @@ class PyHocaCLI(x2go.X2GoClient):
 if not self.is_x2goserver(self.x2go_session_hash):
 self._runtime_error('the remote server does not have the X2Go 
Server software installed', exitcode=1337)
 
+self._pyhoca_logger('authentication has been successful, launching 
session...', loglevel=x2go.loglevel_NOTICE, )
+
+
 def MainLoop(self):
 """\
 Start the main loop of this application.
@@ -682,6 +685,9 @@ class PyHocaCLI(x2go.X2GoClient):
 self.list_profiles()
 sys.exit(0)
 
+if self.args.resume or self.args.new:
+self._pyhoca_logger("give the X2Go session some time to come 
up...", loglevel=x2go.loglevel_NOTICE, )
+
 if self.args.resume:
 self.resume_session(self.x2go_session_hash)
 
@@ -703,10 +709,6 @@ class PyHocaCLI(x2go.X2GoClient):
 
 if not (self.args.new or self.args.resume or 
self.args.share_desktop or self.args.session_profile):
 sys.exit(0)
-
-if self.args.resume or self.args.new:
-self._pyhoca_logger("give the X2Go session some time to come 
up...", loglevel=x2go.loglevel_NOTICE, )
-
 i=0
 while 0 < 
self.get_session(self.x2go_session_hash).get_progress_status() < 100:
 sleep(1)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 73/94: pyhoca-cli.spec: Build-Require python-rpm-macros for OpenSuSE builds.

[git-admin]

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 6ebecc40fd9c0eb38e8063e056e6bc035be898c2
Author: Mihai Moldovan 
Date:   Sat Nov 10 13:39:46 2018 +0100

pyhoca-cli.spec: Build-Require python-rpm-macros for OpenSuSE builds.
---
 debian/changelog | 1 +
 pyhoca-cli.spec  | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 087f1d21..28d16cbd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium
 - It's still %endif, not %fi.
 - Either EL6 or EL7, not both at the same time.
 - Use modern python build and install macros.
+- Build-Require python-rpm-macros for OpenSuSE builds.
 
  -- Mike Gabriel   Wed, 19 Sep 2018 15:20:43 
+0200
 
diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec
index f35650e4..050dedfe 100644
--- a/pyhoca-cli.spec
+++ b/pyhoca-cli.spec
@@ -26,6 +26,9 @@ Requires:   python3-x2go >= 0.6.0.1
 %endif
 %if 0%{?suse_version}
 BuildRequires:  fdupes
+%if ( 0%{?sle_version} && 0%{?sle_version} >= 120300 && 0%{?is_opensuse} ) || 
( 0%{?suse_version} > 1500 )
+BuildRequires:  python-rpm-macros
+%endif
 %endif
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 78/94: pyhoca-cli.spec: also pick files matching PyHoca_CLI* in the site-lib directory.

[git-admin]

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 14eba70f4093a43e540e96a0c67d42305469607e
Author: Mihai Moldovan 
Date:   Sat Nov 10 17:05:08 2018 +0100

pyhoca-cli.spec: also pick files matching PyHoca_CLI* in the site-lib 
directory.
---
 debian/changelog | 1 +
 pyhoca-cli.spec  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 211776fe..790599b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium
 - Include python2_sitelib for CentOS, python3_sitelib otherwise. Comment
   out for now to let builds fail and get a file list.
 - Pick the files correctly.
+- Also pick files matching PyHoca_CLI* in the site-lib directory.
 
  -- Mike Gabriel   Wed, 19 Sep 2018 15:20:43 
+0200
 
diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec
index 3afbc59c..c83680da 100644
--- a/pyhoca-cli.spec
+++ b/pyhoca-cli.spec
@@ -97,10 +97,10 @@ cp -rp man/* %{buildroot}/%{_mandir}/
 %{_bindir}/%{name}
 %if 0%{?el6} || 0%{?el7}
 %{python2_sitelib}/pyhoca/cli/
-%{python2_sitelib}/PyHoca_CLI*/
+%{python2_sitelib}/PyHoca_CLI*
 %else
 %{python3_sitelib}/pyhoca/cli/
-%{python3_sitelib}/PyHoca_CLI*/
+%{python3_sitelib}/PyHoca_CLI*
 %if 0%{?suse_version}
 %if ( 0%{?sle_version} && 0%{?sle_version} >= 120300 && 0%{?is_opensuse} ) || 
( 0%{?suse_version} > 1500 )
 %pycache_only %{python3_sitelib}/__pycache__

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 86/94: misc: copyright update.

[git-admin]

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 d3987254e484d82fb2c7e8274dc8c1c26e4b51d7
Author: Mihai Moldovan 
Date:   Mon Dec 3 01:19:14 2018 +0100

misc: copyright update.
---
 Makefile.docupload | 2 +-
 README | 2 +-
 TODO   | 2 +-
 debian/changelog   | 1 +
 debian/copyright   | 4 ++--
 debian/rules   | 2 +-
 pyhoca-cli | 2 +-
 pyhoca/__init__.py | 2 +-
 pyhoca/cli/frontend.py | 2 +-
 setup.py   | 2 +-
 10 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Makefile.docupload b/Makefile.docupload
index 30857760..cfb120e4 100644
--- a/Makefile.docupload
+++ b/Makefile.docupload
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 # Makefile.docupload file - for pyhoca-cli
-# Copyright 2010-2016 by Mike Gabriel , 
AGPLv3+ applies to this file
+# Copyright 2010-2018 by Mike Gabriel , 
AGPLv3+ applies to this file
 
 VERSION=`head -n1 debian/changelog | sed 's,.*(\(.*\)).*,\1,' | cut -d"-" -f1`
 DOC_HOST=code.x2go.org
diff --git a/README b/README
index 9c1b0e51..7db850e1 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-pyhoca-cli - Copyright (C) 2010-2016 by Mike Gabriel 

+pyhoca-cli - Copyright (C) 2010-2018 by Mike Gabriel 

 
 Contributors:
 2010, Jörg Sawatzki 
diff --git a/TODO b/TODO
index 616f738f..5c729bdb 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-pyhoca-cli - Copyright (C) 2010-2016 by Mike Gabriel 

+pyhoca-cli - Copyright (C) 2010-2018 by Mike Gabriel 

 
 Contributors:
 2010, Jörg Sawatzki 
diff --git a/debian/changelog b/debian/changelog
index 0141ac62..cb660b3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium
 - setup.py: we actually also need the version information, so import it.
 - setup.py: need to import the sys module, not just version_info into
   global namespace.
+- misc: copyright update.
   * pyhoca-cli.spec:
 - Build with Python 2 on CentOS, drop python3-argparse
   dependency (part of stdlib).
diff --git a/debian/copyright b/debian/copyright
index 17c2542e..fed61784 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,11 +4,11 @@ Upstream-Contact: Mike Gabriel 

 Source: http://wiki.x2go.org
 
 Files: *
-Copyright: 2010-2016, Mike Gabriel 
+Copyright: 2010-2018, Mike Gabriel 
 License: AGPL-3+
 
 Files: debian/*
-Copyright: 2010-2016, Mike Gabriel 
+Copyright: 2010-2018, Mike Gabriel 
 License: AGPL-3+
 
 License: AGPL-3+
diff --git a/debian/rules b/debian/rules
index e03da227..41fa4ee2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 # debian/rules file - for pyhoca-cli
 # Based on sample debian/rules file - for GNU Hello (1.3).
-# Copyright 2010-2016 by Mike Gabriel 
+# Copyright 2010-2018 by Mike Gabriel 
 
 %:
dh ${@} --with=python3 --buildsystem=pybuild
diff --git a/pyhoca-cli b/pyhoca-cli
index b5256fe7..a097ae53 100755
--- a/pyhoca-cli
+++ b/pyhoca-cli
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2016 by Mike Gabriel 
+# Copyright (C) 2010-2018 by Mike Gabriel 
 #
 # PyHoca CLI is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/pyhoca/__init__.py b/pyhoca/__init__.py
index d0af13d1..3576f8d4 100644
--- a/pyhoca/__init__.py
+++ b/pyhoca/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2016 by Mike Gabriel 
+# Copyright (C) 2010-2018 by Mike Gabriel 
 #
 # PyHoca CLI is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py
index 072c915c..fb68379c 100644
--- a/pyhoca/cli/frontend.py
+++ b/pyhoca/cli/frontend.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2016 by Mike Gabriel 
+# Copyright (C) 2010-2018 by Mike Gabriel 
 #
 # PyHoca CLI is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/setup.py b/setup.py
index b30d8e6e..8b3d44d6 100755
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2016 by Mike Gabriel 
+# Copyright (C) 2010-2018 by Mike Gabriel 
 #
 # PyHoca is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 76/94: pyhoca-cli.spec: include python2_sitelib for CentOS, python3_sitelib otherwise.

[git-admin]

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 4b69e6117d11f2cd36fe5d4dfbfeed67e7d459d3
Author: Mihai Moldovan 
Date:   Sat Nov 10 14:30:35 2018 +0100

pyhoca-cli.spec: include python2_sitelib for CentOS, python3_sitelib 
otherwise.

Comment out for now to let builds fail and get a file list.
---
 debian/changelog |  2 ++
 pyhoca-cli.spec  | 11 ++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8a7998db..80f5d759 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium
 - Either EL6 or EL7, not both at the same time.
 - Use modern python build and install macros.
 - Build-Require python-rpm-macros for OpenSuSE builds.
+- Include python2_sitelib for CentOS, python3_sitelib otherwise. Comment
+  out for now to let builds fail and get a file list.
 
  -- Mike Gabriel   Wed, 19 Sep 2018 15:20:43 
+0200
 
diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec
index 050dedfe..57d08cbd 100644
--- a/pyhoca-cli.spec
+++ b/pyhoca-cli.spec
@@ -95,7 +95,16 @@ cp -rp man/* %{buildroot}/%{_mandir}/
 %defattr(-,root,root)
 %doc COPYING README TODO
 %{_bindir}/%{name}
-%{python3_sitelib}/*
+%if 0%{?el6} || 0%{?el7}
+#%%{python2_sitelib}/
+%else
+#%%{python3_sitelib}/*
+%if 0%{?suse_version}
+%if ( 0%{?sle_version} && 0%{?sle_version} >= 120300 && 0%{?is_opensuse} ) || 
( 0%{?suse_version} > 1500 )
+%pycache_only %{python3_sitelib}/__pycache__
+%endif
+%endif
+%endif
 %{_mandir}/man1/%{name}.1*
 
 

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 84/94: pyhoca/cli/frontend.py: rephrase auth success message slightly.

[git-admin]

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 192ee99fa63d14e6844827e3edefecac7e549a69
Author: Mike Gabriel 
Date:   Mon Nov 26 10:30:23 2018 +0100

pyhoca/cli/frontend.py: rephrase auth success message slightly.
---
 debian/changelog   | 1 +
 pyhoca/cli/frontend.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d3212d20..cfc2c173 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium
   remote host has the X2Go Server software installed.
 - pyhoca/cli/frontend.py: Be more real-time realistic and user friendly
   with notice log messages after authentication.
+- pyhoca/cli/frontend.py: rephrase auth success message slightly.
   * debian/control:
 + Set Section: from "python" to "x11". More appropriate.
 + Bump versioned D on python3-x2go to (0.6.0.2-0~).
diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py
index 151ec37a..483c2d4d 100644
--- a/pyhoca/cli/frontend.py
+++ b/pyhoca/cli/frontend.py
@@ -656,7 +656,7 @@ class PyHocaCLI(x2go.X2GoClient):
 if not self.is_x2goserver(self.x2go_session_hash):
 self._runtime_error('the remote server does not have the X2Go 
Server software installed', exitcode=1337)
 
-self._pyhoca_logger('authentication has been successful, launching 
session...', loglevel=x2go.loglevel_NOTICE, )
+self._pyhoca_logger('authentication has been successful', 
loglevel=x2go.loglevel_NOTICE, )
 
 
 def MainLoop(self):

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 70/94: pyhoca-cli.spec: either EL6 or EL7, not both at the same time.

[git-admin]

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 55d4bfc1a61798110794ef5d03452dfc659c08a8
Author: Mihai Moldovan 
Date:   Sat Nov 10 12:57:57 2018 +0100

pyhoca-cli.spec: either EL6 or EL7, not both at the same time.
---
 debian/changelog | 1 +
 pyhoca-cli.spec  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b4036706..68a85d4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium
 - Build with Python 2 on CentOS, drop python3-argparse
   dependency (part of stdlib).
 - It's still %endif, not %fi.
+- Either EL6 or EL7, not both at the same time.
 
  -- Mike Gabriel   Wed, 19 Sep 2018 15:20:43 
+0200
 
diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec
index 6e2c7bdf..e28e2257 100644
--- a/pyhoca-cli.spec
+++ b/pyhoca-cli.spec
@@ -13,7 +13,7 @@ URL:http://www.x2go.org/
 Source0:
http://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz
 
 BuildArch:  noarch
-%if 0%{?el6} && 0%{?el7}
+%if 0%{?el6} || 0%{?el7}
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
 Requires:   python-setproctitle
@@ -50,7 +50,7 @@ on desktops and thin clients.
 
 
 %build
-%if 0%{?el6} && 0%{?el7}
+%if 0%{?el6} || 0%{?el7}
 # Make sure we stay on Python 2 on CentOS for the time being. Maybe not for 
EL8.
 %{__python2} setup.py build
 %else

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 58/94: Fix --share-local-folders (aka -F) option and really mount shared folders. (Fixes: #984).

[git-admin]

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 e8dacb1ff7ef2435ee68e83b59d91bfb22a04395
Author: Mike Gabriel 
Date:   Tue Sep 18 18:41:38 2018 +0200

Fix --share-local-folders (aka -F) option and really mount shared folders. 
(Fixes: #984).
---
 debian/changelog   | 2 ++
 pyhoca/cli/frontend.py | 6 ++
 2 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d0b46a46..1e88d5a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ pyhoca-cli (0.5.99.1-0x2go2) UNRELEASED; urgency=medium
 - Add --forward-sshagent / -A cmdline option for enabling SSH agent
   forwarding.
 - Entirely rewrite PyHocaCLI.authenticate() function. (Fixes: #1308).
+- Fix --share-local-folders (aka -F) option and really mount shared 
folders.
+  (Fixes: #984).
   * debian/rules:
 + Build for Python3, not Python2.
 + Switch to pybuild DH build system.
diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py
index 4d94bf52..01732cfc 100644
--- a/pyhoca/cli/frontend.py
+++ b/pyhoca/cli/frontend.py
@@ -438,6 +438,8 @@ class PyHocaCLI(x2go.X2GoClient):
 if self.args.xinerama:
 xinerama = self.args.xinerama
 
+allow_share_local_folders = bool(self.args.share_local_folders)
+
 # setup up the manually configured X2Go session
 self.x2go_session_hash = 
self._X2GoClient__register_session(args.server, 
port=int(self.args.remote_ssh_port),

known_hosts=ssh_known_hosts_filename,
@@ -458,6 +460,7 @@ class PyHocaCLI(x2go.X2GoClient):

print_action=self.args.print_action,

print_action_args=self.args.print_action_args,

share_local_folders=self.args.share_local_folders,
+   
allow_share_local_folders=allow_share_local_folders,

forward_sshagent=self.args.forward_sshagent,

cmd=self.args.command)
 
@@ -698,6 +701,9 @@ class PyHocaCLI(x2go.X2GoClient):
 sleep(1)
 i+=1
 
+session = self._X2GoClient__get_session(self.x2go_session_hash)
+session.set_master_session()
+
 if self._X2GoClient__session_ok(self.x2go_session_hash):
 
 profile_name = 
self._X2GoClient__get_session_profile_name(self.x2go_session_hash)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 71/94: pyhoca-cli.spec: use modern python build and install macros.

[git-admin]

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 b050d3ed1a3a93a40214c4037fbbfefcd66cd413
Author: Mihai Moldovan 
Date:   Sat Nov 10 13:16:47 2018 +0100

pyhoca-cli.spec: use modern python build and install macros.
---
 debian/changelog |  1 +
 pyhoca-cli.spec  | 26 +++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 68a85d4a..4f98e359 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium
   dependency (part of stdlib).
 - It's still %endif, not %fi.
 - Either EL6 or EL7, not both at the same time.
+- Use modern python build and install macros.
 
  -- Mike Gabriel   Wed, 19 Sep 2018 15:20:43 
+0200
 
diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec
index e28e2257..f35650e4 100644
--- a/pyhoca-cli.spec
+++ b/pyhoca-cli.spec
@@ -52,13 +52,33 @@ on desktops and thin clients.
 %build
 %if 0%{?el6} || 0%{?el7}
 # Make sure we stay on Python 2 on CentOS for the time being. Maybe not for 
EL8.
-%{__python2} setup.py build
+%{py2_build}
 %else
-%{__python3} setup.py build
+%if 0%{?suse_version}
+%if 0%{?sle_version} && ( ( 0%{?sle_version} < 120300 && 0%{?is_opensuse} ) || 
( ! 0%{?is_opensuse} ) )
+python3 setup.py build
+%else
+%{python3_build}
+%endif
+%else
+%{py3_build}
+%endif
 %endif
 
 %install
-%{__python3} setup.py install -O1 --skip-build --prefix %{_prefix} --root 
%{buildroot}
+%if 0%{?el6} || 0%{?el7}
+%{py2_install}
+%else
+%if 0%{?suse_version}
+%if 0%{?sle_version} && ( ( 0%{?sle_version} < 120300 && 0%{?is_opensuse} ) || 
( ! 0%{?is_opensuse} ) )
+python3 setup.py install -O1 --skip-build --prefix %{_prefix} --root 
%{buildroot}
+%else
+%{python3_install} -O1 --skip-build
+%endif
+%else
+%{py3_install}
+%endif
+%endif
 mkdir -p %{buildroot}/%{_bindir}/
 cp -p %{name} %{buildroot}/%{_bindir}/
 mkdir -p %{buildroot}/%{_mandir}/

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 67/94: debian/changelog: fix for current version.

[git-admin]

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 716fd7c4994075ddb91ffe5f85c08fa3d72689ba
Author: Mihai Moldovan 
Date:   Sat Nov 10 09:45:51 2018 +0100

debian/changelog: fix for current version.
---
 debian/changelog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/changelog b/debian/changelog
index 528ab512..db495d65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium
 
+  [ Mike Gabriel ]
   * New upstream release (0.6.0.1):
 - Continue development...
   * debian/control:

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 66/94: debian/changelog: fix for previous version.

[git-admin]

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 15298b554a4d436ca79e4d66fa7e8c3ff78d7ddd
Author: Mihai Moldovan 
Date:   Sat Nov 10 09:39:21 2018 +0100

debian/changelog: fix for previous version.
---
 debian/changelog | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 3f3c2f06..528ab512 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,8 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium
 
 pyhoca-cli (0.6.0.0-0x2go1) unstable; urgency=medium
 
-  * New upstream version (0.5.99.1).
+  [ Mike Gabriel ]
+  * New upstream version (0.6.0.0):
 - Port to Python3. (Fixes: #1287).
 - Add --force-password command line switch to override SSH key detection
   code.

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 69/94: pyhoca-cli.spec: it's still %endif, not %fi.

[git-admin]

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 b8bf324cd58d8e5aee4fc3e127f20dc661b90593
Author: Mihai Moldovan 
Date:   Sat Nov 10 11:58:04 2018 +0100

pyhoca-cli.spec: it's still %endif, not %fi.
---
 debian/changelog | 1 +
 pyhoca-cli.spec  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 35a92d0e..b4036706 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium
   * pyhoca-cli.spec:
 - Build with Python 2 on CentOS, drop python3-argparse
   dependency (part of stdlib).
+- It's still %endif, not %fi.
 
  -- Mike Gabriel   Wed, 19 Sep 2018 15:20:43 
+0200
 
diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec
index 23921b94..6e2c7bdf 100644
--- a/pyhoca-cli.spec
+++ b/pyhoca-cli.spec
@@ -23,7 +23,7 @@ BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 Requires:   python3-setproctitle
 Requires:   python3-x2go >= 0.6.0.1
-%fi
+%endif
 %if 0%{?suse_version}
 BuildRequires:  fdupes
 %endif

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 64/94: Continue development...

[git-admin]

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 70aa4a690d3cfd2f1599cbbcccf1f24f810c5234
Author: Mike Gabriel 
Date:   Wed Sep 19 15:22:19 2018 +0200

Continue development...
---
 ChangeLog  | 2 +-
 debian/changelog   | 9 +
 man/man1/pyhoca-cli.1  | 2 +-
 pyhoca/cli/__init__.py | 2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a3557e23..3d05402a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 2018-09-18 21:17:06 +0200 Mike Gabriel (b7aaefa)
 
-   * release 0.6.0.0 (HEAD -> master, tag: 0.6.0.0)
+   * release 0.6.0.1 (HEAD -> master, tag: 0.6.0.1)
 
 2018-09-18 21:07:26 +0200 Mike Gabriel (2a3460f)
 
diff --git a/debian/changelog b/debian/changelog
index 134cfdd8..3f3c2f06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium
+
+  * New upstream release (0.6.0.1):
+- Continue development...
+  * debian/control:
++ Set Section: from "python" to "x11". More appropriate.
+
+ -- Mike Gabriel   Wed, 19 Sep 2018 15:20:43 
+0200
+
 pyhoca-cli (0.6.0.0-0x2go1) unstable; urgency=medium
 
   * New upstream version (0.5.99.1).
diff --git a/man/man1/pyhoca-cli.1 b/man/man1/pyhoca-cli.1
index a7989b13..72dfe617 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 2018" "Version 0.6.0.0" "X2Go Application"
+.TH pyhoca-cli 1 "Sep 2018" "Version 0.6.0.1" "X2Go Application"
 .SH NAME
 pyhoca-cli \- X2Go command line client written in Python
 .SH SYNOPSIS
diff --git a/pyhoca/cli/__init__.py b/pyhoca/cli/__init__.py
index 84ffd602..dd442a93 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.6.0.0"
+__VERSION__ = "0.6.0.1"
 
 from .frontend import *

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 63/94: debian/control: Set Section: from "python" to "x11". More appropriate.

[git-admin]

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 3ba796c4db0b76d59514aaa5de72d31cc7ea4883
Author: Mike Gabriel 
Date:   Wed Sep 19 15:16:55 2018 +0200

debian/control: Set Section: from "python" to "x11". More appropriate.
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index a683ce78..e78ff0c6 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Source: pyhoca-cli
-Section: python
+Section: x11
 Priority: optional
 Maintainer: X2Go Developers 
 Uploaders:

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 62/94: release 0.6.0.0

[git-admin]

oca-cli.1
index 6847f877..a7989b13 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.99.1" "X2Go Application"
+.TH pyhoca-cli 1 "Sep 2018" "Version 0.6.0.0" "X2Go Application"
 .SH NAME
 pyhoca-cli \- X2Go command line client written in Python
 .SH SYNOPSIS
diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec
index 4e4425dd..3453d2d1 100644
--- a/pyhoca-cli.spec
+++ b/pyhoca-cli.spec
@@ -1,5 +1,5 @@
 Name:   pyhoca-cli
-Version:0.5.99.1
+Version:0.6.0.0
 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.1
+Requires:   python3-x2go >= 0.6.0.0
 Requires:   python3-argparse
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
diff --git a/pyhoca/cli/__init__.py b/pyhoca/cli/__init__.py
index 111e8bb5..84ffd602 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.1"
+__VERSION__ = "0.6.0.0"
 
 from .frontend import *

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 65/94: pyhoca-cli.spec: Adjust python3-x2go versioned dependency.

[git-admin]

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 c716bec9925da88ae8c6cffeb550f8c7dd84a174
Author: Mike Gabriel 
Date:   Wed Sep 19 15:22:01 2018 +0200

pyhoca-cli.spec: Adjust python3-x2go versioned dependency.
---
 pyhoca-cli.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec
index 3453d2d1..c2cc5751 100644
--- a/pyhoca-cli.spec
+++ b/pyhoca-cli.spec
@@ -1,5 +1,5 @@
 Name:   pyhoca-cli
-Version:0.6.0.0
+Version:0.6.0.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.6.0.0
+Requires:   python3-x2go >= 0.6.0.1
 Requires:   python3-argparse
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 61/94: Update cmdline options in man page.

[git-admin]

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 2a3460f53036b5026012e143b1eded13ddc6a3f7
Author: Mike Gabriel 
Date:   Tue Sep 18 21:07:26 2018 +0200

Update cmdline options in man page.
---
 man/man1/pyhoca-cli.1 | 22 --
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/man/man1/pyhoca-cli.1 b/man/man1/pyhoca-cli.1
index 750b5f7f..6847f877 100644
--- a/man/man1/pyhoca-cli.1
+++ b/man/man1/pyhoca-cli.1
@@ -18,6 +18,7 @@ pyhoca-cli \- X2Go command line client written in Python
 [
 \fIoptions\fR
 ]
+[[\fI@\fR]\fI\fR]
 'in \n(.iu-\nxu
 .ad b
 'hy
@@ -60,7 +61,7 @@ what X2Go server to connect. \fBpyhoca-cli\fR will not start
 if neither of these two options has been given on the command line.
 .TP
 \*(T<\fB\-\-server\fR \fI\fR\*(T>
-If not in LDAP mode you always have to name the remote X2Go server's hostname 
or IP address.
+Legacy parameter, still supported, but using positional argument 
[\fI@\fR]\fI\fR] should become your preferred syntax.
 .TP
 \*(T<\fB\-P, \-\-session-profile\fR \fI\fR\*(T>
 The name of the session profile to be used to make the connection.
@@ -91,6 +92,9 @@ Terminate running X2Go session . A special 
value for 
 List user's X2Go sessions on server.
 .TP
+\*(T<\fB\-\-list-profiles\fR\*(T>
+List user's X2Go session profiles configure on this client.
+.TP
 \*(T<\fB\-\-from-stdin\fR\*(T>
 For LightDM remote login integration: read
 from STDIN' and start a new session, transfer
 a running session or resume a suspended session.
@@ -114,7 +118,7 @@ Terminate the connected session when pressing CTRL+C 
(instead of suspending the
 \*(T<\fB\-c, \-\-command\fR \fI\fR\*(T>
 Command to run with \fB\-\-new\fR mode on server (default: xterm).
 .TP
-\*(T<\fB\-u, \-\-username\fR \fI\fR\*(T>
+\*(T<\fB\-l, \-u, \-\-username\fR \fI\fR\*(T>
 Username for the session (default: currently logged in user).
 .TP
 \*(T<\fB\-\-password\fR \fI\fR\*(T>
@@ -128,12 +132,15 @@ Enforce authentication with username and password, 
prohibit SSH public/private k
 \*(T<\fB\-p, \-\-remote-ssh-port\fR \fI\fR\*(T>
 Remote X2Go server's SSH port (default: 22).
 .TP
-\*(T<\fB\-k, \-\-ssh-privkey\fR \fI\fR\*(T>
+\*(T<\fB\-i, \-k, \-\-ssh-privkey\fR \fI\fR\*(T>
 Use file  as private key for SSH connections (default: 
~/.ssh/id_rsa).
 .TP
 \*(T<\fB\-\-add\-to\-known\-hosts\fR\*(T>
 Add RSA/DSA host key to ~/.ssh/known_hosts if authenticity of server can't be 
established (default: not set).
 .TP
+\*(T<\fB\-A, \-\-forward\-sshagent\fR\*(T>
+Enable SSH agent forwarding.
+.TP
 \*(T<\fB\-\-sound\fR \fI{pulse|esd|none}\fR\*(T>
 X2Go server's sound system (default: 'pulse').
 .TP
@@ -193,8 +200,11 @@ NOT IMPLEMENTED YET: For SSH based X2Go Session Brokers. 
Full path to a valid SS
 \*(T<\fB\-g, \-\-geometry\fR \fI{x|fullscreen|maximize}\fR\*(T>
 Screen geometry (default: '800x600').
 .TP
+\*(T<\fB\-\-xinerama\fR\*(T>
+Enable Xinerama support for multi-head setups. Requires X2Go Server 4.1.0.0 
(or newer).
+.TP
 \*(T<\fB\-q, \-\-link\fR \fI{modem|isdn|adsl|wan|lan}\fR\*(T>
-link quality (default: 'adsl')
+Link quality (default: 'adsl')
 .TP
 \*(T<\fB\-t, \-\-session\-type\fR \fI{desktop|application}\fR\*(T>
 Session type (default: 'application'). Note: there are also some auto-detection
@@ -205,10 +215,10 @@ It might not always happen what you expect from setting 
this option.
 Compression method (see below for possible values).
 .TP
 \*(T<\fB\-\-kbd\-layout\fR \fI{us|de|fr|...}\fR\*(T>
-Use keyboard layout (default: 'us').
+Use keyboard layout (default: 'null').
 .TP
 \*(T<\fB\-\-kbd\-type\fR \fI{auto|pc105/us|pc105/de|...}\fR\*(T>
-Set Keyboard type (default 'pc105/us'). Use \fIauto\fR as value here to enable 
X2Go's keyboard auto-detection code.
+Set Keyboard type (default 'auto'). Use \fIauto\fR as value here to enable 
X2Go's keyboard auto-detection code.
 .SH BACKEND OPTIONS
 \fBpyhoca-gui\fR supports transparent use of different data backends. For 
configuration three backends are common:
 FILE, GCONF (Linux only) and WINREG (Windows only). The default backend 
currently is the FILE backend

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 68/94: pyhoca-cli.spec: build with Python 2 on CentOS, drop python3-argparse dependency (part of stdlib).

[git-admin]

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 1b3cd85b3442f59b0aac56b45e3a74e0055fe949
Author: Mihai Moldovan 
Date:   Sat Nov 10 09:40:59 2018 +0100

pyhoca-cli.spec: build with Python 2 on CentOS, drop python3-argparse 
dependency (part of stdlib).
---
 debian/changelog |  6 ++
 pyhoca-cli.spec  | 20 +++-
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index db495d65..35a92d0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,12 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium
   * debian/control:
 + Set Section: from "python" to "x11". More appropriate.
 
+  [ Mihai Moldovan ]
+  * New upstream version (0.6.0.1):
+  * pyhoca-cli.spec:
+- Build with Python 2 on CentOS, drop python3-argparse
+  dependency (part of stdlib).
+
  -- Mike Gabriel   Wed, 19 Sep 2018 15:20:43 
+0200
 
 pyhoca-cli (0.6.0.0-0x2go1) unstable; urgency=medium
diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec
index c2cc5751..23921b94 100644
--- a/pyhoca-cli.spec
+++ b/pyhoca-cli.spec
@@ -13,14 +13,20 @@ URL:http://www.x2go.org/
 Source0:
http://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz
 
 BuildArch:  noarch
+%if 0%{?el6} && 0%{?el7}
+BuildRequires:  python-devel
+BuildRequires:  python-setuptools
+Requires:   python-setproctitle
+Requires:   python-x2go >= 0.6.0.1
+%else
 BuildRequires:  python3-devel
-%if 0%{?suse_version}
-BuildRequires:  fdupes
-%endif
 BuildRequires:  python3-setuptools
 Requires:   python3-setproctitle
 Requires:   python3-x2go >= 0.6.0.1
-Requires:   python3-argparse
+%fi
+%if 0%{?suse_version}
+BuildRequires:  fdupes
+%endif
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
@@ -44,8 +50,12 @@ on desktops and thin clients.
 
 
 %build
+%if 0%{?el6} && 0%{?el7}
+# Make sure we stay on Python 2 on CentOS for the time being. Maybe not for 
EL8.
+%{__python2} setup.py build
+%else
 %{__python3} setup.py build
-
+%endif
 
 %install
 %{__python3} setup.py install -O1 --skip-build --prefix %{_prefix} --root 
%{buildroot}

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 60/94: Fix --list-profiles action. Regresion after we introduced the a.host positional argument.

[git-admin]

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 cea4d398aafe0521a9f8a4abd055306110315172
Author: Mike Gabriel 
Date:   Tue Sep 18 21:02:41 2018 +0200

Fix --list-profiles action. Regresion after we introduced the a.host 
positional argument.
---
 pyhoca-cli | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyhoca-cli b/pyhoca-cli
index b7c93bd1..b5256fe7 100755
--- a/pyhoca-cli
+++ b/pyhoca-cli
@@ -290,7 +290,7 @@ Possible values for the --pack NX option are:
 if a.version:
 version()
 
-if not a.username and "@" in a.host:
+if type(a.host) == str and not a.username and "@" in a.host:
 a.username = a.host.split('@')[0]
 a.host = '@'.join(a.host.split('@')[1:])
 

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 56/94: Switch from time.sleep() to gevent.sleep().

[git-admin]

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 dadb385f8654516fcdd5d4f7e875df822541195e
Author: Mike Gabriel 
Date:   Tue Sep 18 16:37:21 2018 +

Switch from time.sleep() to gevent.sleep().
---
 pyhoca/cli/frontend.py | 15 +++
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py
index 4dbe6439..7a85410a 100644
--- a/pyhoca/cli/frontend.py
+++ b/pyhoca/cli/frontend.py
@@ -25,9 +25,8 @@ import x2go
 import sys
 import os
 import copy
-import time
 import getpass
-from gevent import socket
+from gevent import socket, sleep
 
 # for debugging
 import pprint
@@ -696,7 +695,7 @@ class PyHocaCLI(x2go.X2GoClient):
 
 i=0
 while 0 < 
self.get_session(self.x2go_session_hash).get_progress_status() < 100:
-time.sleep(1)
+sleep(1)
 i+=1
 
 if self._X2GoClient__session_ok(self.x2go_session_hash):
@@ -720,11 +719,11 @@ class PyHocaCLI(x2go.X2GoClient):
 session_duration = 0
 
 while self._X2GoClient__session_ok(self.x2go_session_hash):
-time.sleep(2)
+sleep(2)
 session_duration +=2
 
 # wait a little while before telling the user what has 
happened
-time.sleep(2)
+sleep(2)
 
 # refresh session status so we can be most accurate on 
what we report below
 self._X2GoClient__list_sessions(self.x2go_session_hash)
@@ -741,19 +740,19 @@ class PyHocaCLI(x2go.X2GoClient):
 if self.args.share_desktop:
 self._pyhoca_logger("Terminating X2Go shared desktop 
session %s" % session_name, loglevel=x2go.loglevel_INFO, )
 
self._X2GoClient__terminate_session(self.x2go_session_hash)
-time.sleep(2)
+sleep(2)
 self._pyhoca_logger("X2Go session %s has been 
terminated" % session_name, loglevel=x2go.loglevel_NOTICE, )
 elif self.args.terminate_on_ctrl_c:
 self._pyhoca_logger("Terminating X2Go session %s" % 
session_name, loglevel=x2go.loglevel_INFO, )
 
self._X2GoClient__terminate_session(self.x2go_session_hash)
 # giving nxproxy's SSH tunnel some time to settle
-time.sleep(2)
+sleep(2)
 self._pyhoca_logger("X2Go session %s has been 
terminated" % session_name, loglevel=x2go.loglevel_NOTICE, )
 else:
 self._pyhoca_logger("Suspending X2Go session %s" % 
session_name, loglevel=x2go.loglevel_INFO, )
 
self._X2GoClient__suspend_session(self.x2go_session_hash)
 # giving nxproxy's SSH tunnel some time to settle
-time.sleep(2)
+sleep(2)
 self._pyhoca_logger("X2Go session %s has been 
suspended" % session_name, loglevel=x2go.loglevel_NOTICE, )
 
     except x2go.X2GoSessionException as e:

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 59/94: debian/control: The fix for --share-local-folders requires a fixed Python X2Go (>= 0.6.0.1).

[git-admin]

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 61199c57ed64f652d3b2b495cb96112d7605e94b
Author: Mike Gabriel 
Date:   Tue Sep 18 18:42:27 2018 +0200

debian/control: The fix for --share-local-folders requires a fixed Python 
X2Go (>= 0.6.0.1).
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 8ba8f890..a683ce78 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Depends:
  ${misc:Depends},
  ${python3:Depends},
  python3,
- python3-x2go (>=0.5.99.1-0~),
+ python3-x2go (>=0.6.0.1-0~),
  python3-setproctitle,
 Suggests:
  mteleplayer-clientside,

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 47/94: pyhoca-cli main programme: Check for DISPLAY env var being set and having a usable / expectable value.

[git-admin]

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 48793e7f8420ddd902bb61c45fbb1ddf18341b54
Author: Mike Gabriel 
Date:   Wed May 16 08:45:01 2018 +

pyhoca-cli main programme: Check for DISPLAY env var being set and having a 
usable / expectable value.
---
 pyhoca-cli | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/pyhoca-cli b/pyhoca-cli
index 34387415..447969b1 100755
--- a/pyhoca-cli
+++ b/pyhoca-cli
@@ -30,6 +30,7 @@ import x2go
 
 import sys
 import os
+import re
 
 PROG_NAME = os.path.basename(sys.argv[0]).replace('.exe', '')
 PROG_PID  = os.getpid()
@@ -424,6 +425,12 @@ if __name__ == '__main__':
 parser, args = parseargs()
 args.parser = parser
 
+if not os.environ.get('DISPLAY'):
+logger('the display environment variable is unset, can\'t go on 
without a DISPLAY...', x2go.loglevel_ERROR, )
+sys.exit(1)
+elif not re.match("^.*:[0-9]+(|\.[0-9]+)$", os.environ.get('DISPLAY')):
+logger('the display environment variable\'s value is weird ({val}), 
can\'t go on with that...'.format(val=os.environ.get('DISPLAY')), 
x2go.loglevel_ERROR, )
+sys.exit(1)
 try:
 
 # initialize the X2GoClient context and start the connection to the 
X2Go server

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 45/94: keyboard handling: Switch to kbd-type auto and kbd-layout null. Should auto-detect the client-side keyboard in the X2Go session just fine.

[git-admin]

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 4de65701b754dcd981fcc63c5514ac8fdbe2f5af
Author: Mike Gabriel 
Date:   Tue May 15 15:49:35 2018 +0200

keyboard handling: Switch to kbd-type auto and kbd-layout null. Should 
auto-detect the client-side keyboard in the X2Go session just fine.
---
 pyhoca-cli | 12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pyhoca-cli b/pyhoca-cli
index 4c43750a..34387415 100755
--- a/pyhoca-cli
+++ b/pyhoca-cli
@@ -187,8 +187,8 @@ nx_options =  [
 {'args':['-q','--link'], 'default': 'adsl', 'choices': 
('modem','isdn','adsl','wan','lan'), 'help': 'link quality (default: 
\'adsl\')',},
 {'args':['-t','--session-type'], 'default': 'application', 
'choices': ('desktop', 'application'), 'help': 'session type (default: 
\'application\')', },
 {'args':['--pack'], 'default': '16m-jpeg-9', 'help': 
'compression methods (see below for possible values)', },
-{'args':['--kbd-layout'], 'default': 'us', 'help': 'use 
keyboard layout (default: \'us\')',},
-{'args':['--kbd-type'], 'default': 'pc105/us', 'help': 
'set Keyboard type (default: \'pc105/us\')',},
+{'args':['--kbd-type'], 'default': 'auto', 'help': 'set 
Keyboard type (default: \'auto\', other allowed options: \'pc105/us\', 
\'pc105/de\', etc.)',},
+{'args':['--kbd-layout'], 'default': 'null', 'help': 'use 
keyboard layout (default: \'null\', allowed options: \'de\', \'fr\', etc.)',},
   ]
 compat_options =  [
 {'args':['--port'], 'default': None, 'help': 
'compatibility option, synonymous to --remote-ssh-port PORT', },
@@ -395,6 +395,14 @@ Possible values for the --pack NX option are:
 if not a.ssh_privkey and os.path.isfile('%s/.ssh/id_dsa' % current_home):
 a.ssh_privkey = '%s/.ssh/id_dsa' % current_home
 
+# hang around the keyboard chaos...
+a.kbd_type   = a.kbd_type.lower()
+a.kbd_layout = a.kbd_layout.lower()
+if a.kbd_layout == 'auto':
+a.kbd_type = 'auto'
+if a.kbd_type == 'auto':
+a.kbd_layout = 'null'
+
 # lightdm remote login magic takes place here
 if a.from_stdin:
 

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 50/94: debian/changelog: Add closure for #1287.

[git-admin]

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 bee1402138e91941bbcbf9e0e16034ea7682273d
Author: Mike Gabriel 
Date:   Tue Sep 18 09:12:46 2018 +0200

debian/changelog: Add closure for #1287.
---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f0e152aa..11ecdc90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 pyhoca-cli (0.5.99.1-0x2go2) UNRELEASED; urgency=medium
 
   * New upstream version (0.5.99.1).
-- Port to Python3.
+- Port to Python3. (Fixes: #1287).
 - Add --force-password command line switch to override SSH key detection
   code.
 - Add --try-resume cmd line option and feature.

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 52/94: pyhoca-clI: Reserve -l as username option. Just like in OpenSSH.

[git-admin]

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 56fc65147d191fde97a6ccb33b3a40fca3c7a9be
Author: Mike Gabriel 
Date:   Tue Sep 18 11:32:36 2018 +

pyhoca-clI: Reserve -l as username option. Just like in OpenSSH.
---
 pyhoca-cli | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyhoca-cli b/pyhoca-cli
index 7bf6138e..989774b5 100755
--- a/pyhoca-cli
+++ b/pyhoca-cli
@@ -136,7 +136,7 @@ action_options =   [
{'args':['-T','--terminate'], 'default': None, 'metavar': 
'SESSION_NAME', 'help': 'terminate running X2Go session SESSION_NAME', },
{'args':['-L','--list-sessions'], 'default': False, 
'action': 'store_true', 'help': 'list user\'s X2Go sessions on server', },
{'args':['--list-desktops'], 'default': False, 'action': 
'store_true', 'help': 'list X2Go desktop sessions that are available for 
sharing', },
-   {'args':['-l','--list-profiles'], 'default': False, 
'action': 'store_true', 'help': 'list user\'s X2Go pre-configured session 
profiles', },
+   {'args':['--list-profiles'], 'default': False, 'action': 
'store_true', 'help': 'list user\'s X2Go pre-configured session profiles', },
{'args':['-P','--session-profile'], 'default': None, 
'help': 'load x2goclient session profiles and use the session profile 
SESSION_PROFILE', },
  ]
 if _X2GOCLIENT_OS == "Linux":
@@ -156,7 +156,7 @@ debug_options =   [
 x2go_options =[
 # NOT IMPLEMENTED {'args':['--config'], 'default': 
'~/.x2goclient/sessions', 'help': 'x2goclient config file containing x2go 
session settings (default: ~/.x2goclient/sessions)', },
 {'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':['-l', '-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)', },

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 48/94: update debian/changelog

[git-admin]

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 ac9452623b2afaa04cff93e06daf7b5c3389d0b1
Author: Mike Gabriel 
Date:   Wed May 16 08:46:51 2018 +

update debian/changelog
---
 debian/changelog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 983689b4..8c76a862 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ pyhoca-cli (0.5.99.1-0x2go1) UNRELEASED; urgency=medium
 - Fix duplicate password prompt. Regression fix.
 - keyboard handling: Switch to kbd-type auto and kbd-layout null. Should
   auto-detect the client-side keyboard in the X2Go session just fine.
+- pyhoca-cli main programme: Check for DISPLAY env var being set and having
+  a usable / expectable value.
   * debian/rules:
 + Build for Python3, not Python2.
 + Switch to pybuild DH build system.

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 51/94: Entirely rewrite PyHocaCLI.authenticate() function. (Fixes: #1308).

[git-admin]

_unlock_counter -= 1
+# undo auth counter decrement
+_auth_count += 1
+continue
+
+if not force_password_auth and _auth_count >= 1:
+self._pyhoca_logger('unlocking of SSH key failed, 
proceeding with interactive login', loglevel=x2go.loglevel_WARN, )
+force_password_auth = True
+password = None
+passphrase = None
+
+elif not str(e).lower().startswith('not a valid dsa 
private key file') or \
+ not str(e).lower().startswith('not a valid rsa 
private key file') or \
+ not str(e).lower().startswith('incompatible ssh peer 
(no acceptable kex algorithm)') or  \
+ not str(e).lower().startswith('no authentication 
methods available') \
+:
+
+if force_password_auth:
+self._pyhoca_logger('password based login for 
,,%s\'\' failed [SSHException]' % _username, loglevel=x2go.loglevel_WARN, )
+else:
+self._pyhoca_logger('passwordless login for 
,,%s\'\' failed [SSHException]' % _username, loglevel=x2go.loglevel_WARN, )
+
+# let's bail out here...
+self._runtime_error(str(e), exitcode=253)
 
-# workaround for Python bug: http://bugs.python.org/issue11236
-try:
-if self.args.password is not None and '\x03' in 
self.args.password:
-raise KeyboardInterrupt()
-except KeyboardInterrupt:
-self._runtime_error('Authentication cancelled by user by 
hitting Ctrl-C at password prompt', exitcode=-200)
+else:
 
-_auth_count -= 1
+self._pyhoca_logger('[SSHException] the following 
error will be ignored: %s' % str(e), loglevel=x2go.loglevel_WARN)
+self._pyhoca_logger('proceeding to interactive login 
for user ,,%s\'\'' % _username, loglevel=x2go.loglevel_NOTICE, )
+force_password_auth = True
+password = None
+passphrase = None
 
-if not connected and not _auth_count:
+if not connected and _auth_count <= 0:
 if self.auth_attempts >= 2:
 self._runtime_error('authentication failed, too many 
failures during interactive login', exitcode=-201)
 elif self.auth_attempts == 1:
-self._runtime_error('interactive authentication 
failed', exitcode=-202)
-else:
-self._runtime_error('non-interactive authentication 
failed', exitcode=-203)
+self._runtime_error('authentication failed', 
exitcode=-202)
+
 
 except socket.error as e:
 self._runtime_error('a socket error occured while establishing the 
connection: %s' % str(e), exitcode=-245)
 
+# drop clear text passwords...
+password = None
+passphrase = None
+
 def MainLoop(self):
 """\
 Start the main loop of this application.

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 55/94: pyhoca-cli: Extract username from host parameter, if an @ is in the host string.

[git-admin]

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 119186045a7c4760fd6b855ebe9c3b680a50d63f
Author: Mike Gabriel 
Date:   Tue Sep 18 11:53:38 2018 +

pyhoca-cli: Extract username from host parameter, if an @ is in the host 
string.
---
 pyhoca-cli | 4 
 1 file changed, 4 insertions(+)

diff --git a/pyhoca-cli b/pyhoca-cli
index 60373fa5..b7c93bd1 100755
--- a/pyhoca-cli
+++ b/pyhoca-cli
@@ -290,6 +290,10 @@ Possible values for the --pack NX option are:
 if a.version:
 version()
 
+if not a.username and "@" in a.host:
+a.username = a.host.split('@')[0]
+a.host = '@'.join(a.host.split('@')[1:])
+
 # if no username is given we use the uid under which this programme is run
 if a.username is None and not a.session_profile:
 a.username = current_user

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 54/94: pyhoca-cli: Fake SSH like login with additional [host] as positional argument.

[git-admin]

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 0171816c2793862fd2a8abbac7ce1716ffed8470
Author: Mike Gabriel 
Date:   Tue Sep 18 11:49:23 2018 +

pyhoca-cli: Fake SSH like login with additional [host] as positional 
argument.
---
 pyhoca-cli | 4 
 1 file changed, 4 insertions(+)

diff --git a/pyhoca-cli b/pyhoca-cli
index 2a695933..60373fa5 100755
--- a/pyhoca-cli
+++ b/pyhoca-cli
@@ -267,6 +267,8 @@ Possible values for the --pack NX option are:
 del opt['args']
 p_group.add_argument(*args, **opt)
 
+p.add_argument('host', nargs='?', default=None, help='host to connect to 
(as alternative to --server option)')
+
 a = p.parse_args()
 
 if a.debug:
@@ -294,6 +296,8 @@ Possible values for the --pack NX option are:
 
 if not (a.session_profile or a.list_profiles):
 
+if a.host and not a.server: a.server = a.host
+
 # the --server (or --session-profile) option is required for most 
operations
 if not a.server and not a.from_stdin:
 runtime_error ("argument --server (or --session-profile) is 
required", parser=p, exitcode=1)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 46/94: update debian/changelog

[git-admin]

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 6984ba62a583c6856ace6d963cc20bbc4578cf4a
Author: Mike Gabriel 
Date:   Tue May 15 15:50:13 2018 +0200

update debian/changelog
---
 debian/changelog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 439dcb53..983689b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ pyhoca-cli (0.5.99.1-0x2go1) UNRELEASED; urgency=medium
 - Add --try-resume cmd line option and feature.
 - setup.py: Fix version string detection. (Copy+paste flaw...).
 - Fix duplicate password prompt. Regression fix.
+- keyboard handling: Switch to kbd-type auto and kbd-layout null. Should
+  auto-detect the client-side keyboard in the X2Go session just fine.
   * debian/rules:
 + Build for Python3, not Python2.
 + Switch to pybuild DH build system.

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 49/94: Add --forward-sshagent / -A cmdline option for enabling SSH agent forwarding.

[git-admin]

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 d417c628e0ece776a3c0343110070dadcbee176a
Author: Mike Gabriel 
Date:   Tue Sep 18 09:12:18 2018 +0200

Add --forward-sshagent / -A cmdline option for enabling SSH agent 
forwarding.
---
 debian/changelog   | 7 ---
 pyhoca-cli | 6 +-
 pyhoca/cli/frontend.py | 1 +
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8c76a862..f0e152aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-pyhoca-cli (0.5.99.1-0x2go1) UNRELEASED; urgency=medium
+pyhoca-cli (0.5.99.1-0x2go2) UNRELEASED; urgency=medium
 
   * New upstream version (0.5.99.1).
 - Port to Python3.
@@ -11,6 +11,8 @@ pyhoca-cli (0.5.99.1-0x2go1) UNRELEASED; urgency=medium
   auto-detect the client-side keyboard in the X2Go session just fine.
 - pyhoca-cli main programme: Check for DISPLAY env var being set and having
   a usable / expectable value.
+- Add --forward-sshagent / -A cmdline option for enabling SSH agent
+  forwarding.
   * debian/rules:
 + Build for Python3, not Python2.
 + Switch to pybuild DH build system.
@@ -25,9 +27,8 @@ 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   Sat, 12 May 2018 20:37:21 
+
+ -- Mike Gabriel   Tue, 18 Sep 2018 09:10:58 
+0200
 
 pyhoca-cli (0.5.0.4-0x2go1) unstable; urgency=medium
 
diff --git a/pyhoca-cli b/pyhoca-cli
index 447969b1..1856777d 100755
--- a/pyhoca-cli
+++ b/pyhoca-cli
@@ -170,6 +170,9 @@ x2go_options =[
 {'args':['--terminate-on-ctrl-c'], 'default': False, 
'action': 'store_true', 'help': 'terminate the connected session when pressing 
CTRL+C (instead of suspending the session)', },
 {'args':['--auth-attempts'], 'default': 3, 'help': 'number 
of authentication attempts before authentication fails (default: 3)', },
   ]
+ssh_options = [
+{'args':['-A', '--forward-sshagent'], 'default': False, 
'action': 'store_true', 'help': 'forward SSH agent authentication socket', },
+  ]
 print_options =   [
 {'args':['--print-action'], 'default': 'PDFVIEW', 
'choices': PRINT_ACTIONS, 'help': 'action to be performed for incoming X2Go 
print jobs (default: \'PDFVIEW\')', },
 {'args':['--pdfview-cmd'], 'default': None, 'help': 'PDF 
viewer command for displaying incoming X2Go print jobs (default: \'%s\'); this 
option selects \'--print-action PDFVIEW\'' % DEFAULT_PDFVIEW_CMD,},
@@ -250,13 +253,14 @@ Possible values for the --pack NX option are:
 p_actionopts = p.add_argument_group('client actions')
 p_debugopts = p.add_argument_group('debug options')
 p_x2goopts = p.add_argument_group('X2Go options')
+p_sshopts = p.add_argument_group('SSH options')
 p_printopts = p.add_argument_group('X2Go print options')
 p_brokeropts = p.add_argument_group('X2Go Session Broker client options')
 p_nxopts = p.add_argument_group('NX options')
 p_backendopts = p.add_argument_group('Python X2Go backend options (for 
experts only)')
 p_compatopts = p.add_argument_group('compatibility options')
 
-for (p_group, opts) in ((p_x2goopts, x2go_options), (p_printopts, 
print_options), (p_brokeropts, broker_options), (p_actionopts, action_options), 
(p_debugopts, debug_options), (p_nxopts, nx_options), (p_backendopts, 
backend_options), (p_compatopts, compat_options)):
+for (p_group, opts) in ((p_x2goopts, x2go_options), (p_sshopts, 
ssh_options), (p_printopts, print_options), (p_brokeropts, broker_options), 
(p_actionopts, action_options), (p_debugopts, debug_options), (p_nxopts, 
nx_options), (p_backendopts, backend_options), (p_compatopts, compat_options)):
 for opt in opts:
 
 args = opt['args']
diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py
index 6e54164e..a73dc2f0 100644
--- a/pyhoca/cli/frontend.py
+++ b/pyhoca/cli/frontend.py
@@ -459,6 +459,7 @@ class PyHocaCLI(x2go.X2GoClient):

print_action=self.args.print_action,

print_action_args=self.args.print_action_args,

share_local_folders=self.args.share_local_folders,
+   
forward_sshagent=self.args.forward_sshagent,

cmd=self.args.command)
 
 def authenticate(self):

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git

[X2Go-Commits] [x2goclient] 53/94: pyhoca-cli: Add -i as alias for --ssh-privkey. Just like in OpenSSH.

[git-admin]

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 0dabf4eaa4b118d7652ca7baf34bec3e9c81a865
Author: Mike Gabriel 
Date:   Tue Sep 18 11:33:43 2018 +

pyhoca-cli: Add -i as alias for --ssh-privkey. Just like in OpenSSH.
---
 pyhoca-cli | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyhoca-cli b/pyhoca-cli
index 989774b5..2a695933 100755
--- a/pyhoca-cli
+++ b/pyhoca-cli
@@ -160,7 +160,7 @@ x2go_options =[
 {'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':['-i', '-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)', },
 {'args':['--sound'], 'default': 'pulse', 'choices': 
('pulse', 'esd', 'none'), 'help': 'X2Go server sound system (default: 
\'pulse\')', },
 {'args':['--printing'], 'default': False, 'action': 
'store_true', 'help': 'use X2Go printing (default: disabled)', },

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 36/94: Add --try-resume cmd line option and feature. Bump version to 0.5.99.1.

[git-admin]

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
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 57/94: Set specific 'Passphrase: ' prompt (not 'Password: ') when we query for SSH key passphrases.

[git-admin]

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 75f53ca91bd6ce55448e8b6166862f1b48e37df1
Author: Mike Gabriel 
Date:   Tue Sep 18 16:39:29 2018 +

Set specific 'Passphrase: ' prompt (not 'Password: ') when we query for SSH 
key passphrases.
---
 pyhoca/cli/frontend.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py
index 7a85410a..4d94bf52 100644
--- a/pyhoca/cli/frontend.py
+++ b/pyhoca/cli/frontend.py
@@ -533,7 +533,7 @@ class PyHocaCLI(x2go.X2GoClient):
 if passphrase == '':
 self._pyhoca_logger('empty SSH key passphrase 
(%s), try again...' % self.args.ssh_privkey, loglevel=x2go.loglevel_WARN, )
 self._pyhoca_logger('unlock SSH key file (%s)' % 
self.args.ssh_privkey, loglevel=x2go.loglevel_NOTICE, )
-passphrase = getpass.getpass()
+passphrase = getpass.getpass('Passphrase: ')
 passphrase_unlock_counter -= 1
 # undo auth counter decrement
 _auth_count += 1
@@ -594,7 +594,7 @@ class PyHocaCLI(x2go.X2GoClient):
 if passphrase is not None and passphrase != '':
 self._pyhoca_logger('wrong SSH key passphrase 
(%s), try again...' % self.args.ssh_privkey, loglevel=x2go.loglevel_WARN, )
 self._pyhoca_logger('unlock SSH key file (%s)' % 
self.args.ssh_privkey, loglevel=x2go.loglevel_NOTICE, )
-passphrase = getpass.getpass()
+passphrase = getpass.getpass('Passphrase: ')
 passphrase_unlock_counter -= 1
 # undo auth counter decrement
 _auth_count += 1

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 01/94: debian/control: whitespace only.

[git-admin]

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 8541c413f10f20386d45f0176d539aeccd236a16
Author: Mihai Moldovan 
Date:   Tue Jan 26 20:23:34 2016 +0100

debian/control: whitespace only.
---
 debian/control | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 629dc231..5a3f52de 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: X2Go Developers 
 Uploaders:
  Mike Gabriel 
-Build-Depends: 
+Build-Depends:
  debhelper (>= 7.0.50~),
  man2html-base | man2html,
  python (>=2.6.5-0~),
@@ -17,7 +17,7 @@ X-Python-Version: >= 2.6
 
 Package: pyhoca-cli
 Architecture: all
-Depends: 
+Depends:
  ${misc:Depends},
  python,
  python-x2go (>=0.5.0.0-0~),

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 33/94: debian/changelog

[git-admin]

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 
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
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 38/94: setup.py: Fix version string detection. (Copy+paste flaw...).

[git-admin]

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 
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
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 39/94: debian/control: Drop D (pyhoca-cli): python3-argparse. Part of stdlib in Python3 these days.

[git-admin]

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 
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
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 42/94: pyhoca/cli/frontend.py: Fix for previous commit.

[git-admin]

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 ca983f4270fa818338f66ea475b15a8d17c9f4e8
Author: Mike Gabriel 
Date:   Mon May 14 14:53:31 2018 +0200

pyhoca/cli/frontend.py: Fix for previous commit.
---
 pyhoca/cli/frontend.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py
index 5ef0d44e..e7f40012 100644
--- a/pyhoca/cli/frontend.py
+++ b/pyhoca/cli/frontend.py
@@ -474,7 +474,7 @@ class PyHocaCLI(x2go.X2GoClient):
 _auth_count = self.auth_attempts +1
 while not connected and _auth_count:
 try:
-if self.force_password_auth:
+if self.args.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
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 44/94: Add --xinerama (or -x) command line option.

[git-admin]

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 2bc1ab0f4390c21b5f6adb76d13f7a680cd7ede4
Author: Mike Gabriel 
Date:   Mon May 14 16:28:38 2018 +0200

Add --xinerama (or -x) command line option.
---
 pyhoca-cli | 1 +
 pyhoca/cli/frontend.py | 5 +
 2 files changed, 6 insertions(+)

diff --git a/pyhoca-cli b/pyhoca-cli
index 1df4cac5..4c43750a 100755
--- a/pyhoca-cli
+++ b/pyhoca-cli
@@ -183,6 +183,7 @@ broker_options =  [
 
 nx_options =  [
 {'args':['-g','--geometry'], 'default': '800x600','help': 
'screen geometry: \'x\' or \'fullscreen\' (default: 
\'800x600\')',},
+{'args':['-x','--xinerama'], 'default': False, 'action': 
'store_true', 'help': 'enable Xinerama support in remote X2Go session',},
 {'args':['-q','--link'], 'default': 'adsl', 'choices': 
('modem','isdn','adsl','wan','lan'), 'help': 'link quality (default: 
\'adsl\')',},
 {'args':['-t','--session-type'], 'default': 'application', 
'choices': ('desktop', 'application'), 'help': 'session type (default: 
\'application\')', },
 {'args':['--pack'], 'default': '16m-jpeg-9', 'help': 
'compression methods (see below for possible values)', },
diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py
index bd7e9cc2..6e54164e 100644
--- a/pyhoca/cli/frontend.py
+++ b/pyhoca/cli/frontend.py
@@ -435,6 +435,10 @@ class PyHocaCLI(x2go.X2GoClient):
 
 else:
 
+xinerama = False
+if self.args.xinerama:
+xinerama = self.args.xinerama
+
 # setup up the manually configured X2Go session
 self.x2go_session_hash = 
self._X2GoClient__register_session(args.server, 
port=int(self.args.remote_ssh_port),

known_hosts=ssh_known_hosts_filename,
@@ -444,6 +448,7 @@ class PyHocaCLI(x2go.X2GoClient):
profile_name = 
'Pyhoca-Client_Session',

session_type=self.args.session_type,
link=self.args.link,
+   
xinerama=self.args.xinerama,

geometry=self.args.geometry,
pack=self.args.pack,

cache_type='unix-kde',

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [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.

[git-admin]

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 
Date:   Sun May 13 18:31:27 2018 +

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
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 43/94: pyhoca/cli/frontend.py: Fix for previous commit (2).

[git-admin]

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 bda4775a1ec550344ec9101a804a5954cbed5538
Author: Mike Gabriel 
Date:   Mon May 14 14:54:23 2018 +0200

pyhoca/cli/frontend.py: Fix for previous commit (2).
---
 pyhoca/cli/frontend.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py
index e7f40012..bd7e9cc2 100644
--- a/pyhoca/cli/frontend.py
+++ b/pyhoca/cli/frontend.py
@@ -474,7 +474,7 @@ class PyHocaCLI(x2go.X2GoClient):
 _auth_count = self.auth_attempts +1
 while not connected and _auth_count:
 try:
-if self.args.force_password_auth:
+if self.args.force_password:
 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
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 32/94: pyhoca-cli: Add --force-password command line switch to override SSH key detection code.

[git-admin]

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 
Date:   Tue Mar 6 20:17:50 2018 +

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
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 34/94: man page: Add --force-password option.

[git-admin]

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 
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\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
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 35/94: pyhoca-cli.1: Rephrase info for --from-stdin slightly.

[git-admin]

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 
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 . A special 
value for 
-For LightDM remote login integration: read   
  from STDIN' and start a new session, transfer
+For LightDM remote login integration: read
 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
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 40/94: update debian/changelog

[git-admin]

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 
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   Sat, 12 May 2018 20:37:21 
+

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 41/94: Fix duplicate password prompt. Regression fix.

[git-admin]

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 
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   Sat, 12 May 2018 20:37:21 
+
 
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
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 31/94: Enforce Python3 build, fix FTBFS. (debian/rules: Switch to pybuild DH build system.)

[git-admin]

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 
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   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 
 
-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
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 26/94: debian/rules: Build for Python3, not Python2.

[git-admin]

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 04eabd578c44beb3c7bce12ee7785df78848a877
Author: Mike Gabriel 
Date:   Fri Sep 22 14:12:47 2017 +0200

debian/rules: Build for Python3, not Python2.
---
 debian/rules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index f4eeb162..30a7635e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,10 +3,10 @@
 # Based on sample debian/rules file - for GNU Hello (1.3).
 # Copyright 2010-2016 by Mike Gabriel 
 
-WITH_PYTHON2 = $(shell test -f /usr/bin/dh_python2 && echo "--with python2")
+WITH_PYTHON3 = $(shell test -f /usr/bin/dh_python2 && echo "--with python3")
 
 %:
-   dh ${@} ${WITH_PYTHON2}
+   dh ${@} ${WITH_PYTHON3}
 
 override_dh_auto_clean:
rm -Rf PyHoca_CLI.egg-info/

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 24/94: debian/control: Switch to python3-* dependencies.

[git-admin]

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 eb844a1fcf4661c2c3f35df2d7c46f6e0dc22ee4
Author: Mike Gabriel 
Date:   Fri Sep 22 12:11:16 2017 +0200

debian/control: Switch to python3-* dependencies.
---
 debian/control | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/control b/debian/control
index 41989596..b4ee12c4 100644
--- a/debian/control
+++ b/debian/control
@@ -8,9 +8,9 @@ Uploaders:
 Build-Depends:
  debhelper (>= 9),
  man2html-base | man2html,
- python (>=2.6.5-0~),
- python-setuptools,
- python-support (>=0.90) | dh-python
+ python3 (>=2.6.5-0~),
+ python3-setuptools,
+ python3-support (>=0.90) | dh-python3
 Standards-Version: 3.9.6
 Homepage: http://code.x2go.org/releases/source/pyhoca-cli
 Vcs-Git: git://code.x2go.org/pyhoca-cli.git
@@ -21,10 +21,10 @@ Package: pyhoca-cli
 Architecture: all
 Depends:
  ${misc:Depends},
- python,
- python-x2go (>=0.6.0.0-0~),
- python-argparse,
- python-setproctitle,
+ python3,
+ python3-x2go (>=0.6.0.0-0~),
+ python3-argparse,
+ python3-setproctitle,
 Suggests:
  mteleplayer-clientside,
 Description: Command line X2Go client written in Python

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 29/94: pyhoca-cli.spec: Adapt to PyHoca-CLI's Python3 port.

[git-admin]

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 b427400d1ec9a0e5de1cbb721bfa3aaf7c726446
Author: Mike Gabriel 
Date:   Mon Sep 25 12:52:50 2017 +0200

pyhoca-cli.spec: Adapt to PyHoca-CLI's Python3 port.
---
 pyhoca-cli.spec | 25 +
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec
index c87acb99..2d860936 100644
--- a/pyhoca-cli.spec
+++ b/pyhoca-cli.spec
@@ -1,5 +1,5 @@
 Name:   pyhoca-cli
-Version:0.5.0.5
+Version:0.5.99.0
 Release:0.0x2go1%{?dist}
 Summary:Command line X2Go client written in Python
 
@@ -13,23 +13,16 @@ URL:http://www.x2go.org/
 Source0:
http://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz
 
 BuildArch:  noarch
+BuildRequires:  python3-devel
 %if 0%{?suse_version}
-BuildRequires:  python-devel
 BuildRequires:  fdupes
-%else
-BuildRequires:  python2-devel
 %endif
-BuildRequires:  python-setuptools
-Requires:   python-setproctitle
-Requires:   python-x2go >= 0.5.0.0
-Requires:   python-argparse
+BuildRequires:  python3-setuptools
+Requires:   python3-setproctitle
+Requires:   python3-x2go >= 0.5.99.0
+Requires:   python3-argparse
 
-%if 0%{?el5}
-# For compatibility with EPEL5
-BuildRoot:  %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XX)
-%else
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
-%endif
 
 %description
 X2Go is a server based computing environment with:
@@ -51,11 +44,11 @@ on desktops and thin clients.
 
 
 %build
-%{__python} setup.py build
+%{__python3} setup.py build
 
 
 %install
-%{__python} setup.py install -O1 --skip-build --prefix %{_prefix} --root 
%{buildroot}
+%{__python3} setup.py install -O1 --skip-build --prefix %{_prefix} --root 
%{buildroot}
 mkdir -p %{buildroot}/%{_bindir}/
 cp -p %{name} %{buildroot}/%{_bindir}/
 mkdir -p %{buildroot}/%{_mandir}/
@@ -69,7 +62,7 @@ cp -rp man/* %{buildroot}/%{_mandir}/
 %defattr(-,root,root)
 %doc COPYING README TODO
 %{_bindir}/%{name}
-%{python_sitelib}/*
+%{python3_sitelib}/*
 %{_mandir}/man1/%{name}.1*
 
 

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 30/94: debian/rules: Typo fix in WITH_PYTHON3 variable assignment.

[git-admin]

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 957fb1a0bfe11ba9e79273c76ab407e7b005a871
Author: Mike Gabriel 
Date:   Mon Sep 25 13:49:05 2017 +0200

debian/rules: Typo fix in WITH_PYTHON3 variable assignment.
---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 30a7635e..3f273214 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 # Based on sample debian/rules file - for GNU Hello (1.3).
 # Copyright 2010-2016 by Mike Gabriel 
 
-WITH_PYTHON3 = $(shell test -f /usr/bin/dh_python2 && echo "--with python3")
+WITH_PYTHON3 = $(shell test -f /usr/bin/dh_python3 && echo "--with python3")
 
 %:
dh ${@} ${WITH_PYTHON3}

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 20/94: Port to Python3.

[git-admin]

   print("configuration files: %s" % 
_session_profiles.config_files)
 if hasattr(_session_profiles, 'user_config_file') and 
_session_profiles.user_config_file is not None:
-print "user configuration file: %s" % 
_session_profiles.user_config_file
+print("user configuration file: %s" % 
_session_profiles.user_config_file)
 if hasattr(_session_profiles, 'broker_url') and 
_session_profiles.broker_url is not None:
-print "X2Go Session Broker URL: %s" % 
_session_profiles.broker_url
-print
+print("X2Go Session Broker URL: %s" % 
_session_profiles.broker_url)
+print()
 for _profile_id in _session_profiles.profile_ids:
 _profile_config = 
_session_profiles.get_profile_config(_profile_id)
 _session_params = 
_session_profiles.to_session_params(_profile_id)
-print 'Profile ID: %s' % _profile_id
-print 'Profile Name: %s' % _session_params['profile_name']
-print 'Profile Configuration:'
+print('Profile ID: %s' % _profile_id)
+print('Profile Name: %s' % _session_params['profile_name'])
+print('Profile Configuration:')
 pprint.pprint(_profile_config)
-print 'Derived session parameters:'
+print('Derived session parameters:')
 pprint.pprint(_session_params)
-print
+print()
 
 # done
 sys.exit(0)
@@ -455,16 +455,16 @@ class PyHocaCLI(x2go.X2GoClient):
 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
-except x2go.PasswordRequiredException, e:
+except x2go.PasswordRequiredException as e:
 self._pyhoca_logger('unlock SSH key file (%s)' % 
self.args.ssh_privkey, loglevel=x2go.loglevel_NOTICE, )
 self.args.password = getpass.getpass()
-except x2go.AuthenticationException, e:
+except x2go.AuthenticationException as e:
 force_password_auth = True
 self._pyhoca_logger('passwordless login for ,,%s\'\' 
failed' % _username, loglevel=x2go.loglevel_WARN, )
 self._pyhoca_logger('proceeding to interactive login for 
user ,,%s\'\'' % _username, loglevel=x2go.loglevel_NOTICE, )
 except x2go.BadHostKeyException:
 self._runtime_error('SSH host key verification for remote 
host [%s]:%s failed' % (self.args.server, self.args.remote_ssh_port), 
exitcode=-254)
-except x2go.SSHException, e:
+except x2go.SSHException as e:
 if str(e) not in ('not a valid DSA private key file', 
'Incompatible ssh peer (no acceptable kex algorithm)', 'No authentication 
methods available'):
 self._runtime_error(str(e), exitcode=253)
 force_password_auth = True
@@ -491,7 +491,7 @@ class PyHocaCLI(x2go.X2GoClient):
 else:
 self._runtime_error('non-interactive authentication 
failed', exitcode=-203)
 
-except socket.error, e:
+except socket.error as e:
 self._runtime_error('a socket error occured while establishing the 
connection: %s' % str(e), exitcode=-245)
 
 def MainLoop(self):
@@ -603,6 +603,6 @@ class PyHocaCLI(x2go.X2GoClient):
 time.sleep(2)
 self._pyhoca_logger("X2Go session %s has been 
suspended" % session_name, loglevel=x2go.loglevel_NOTICE, )
 
-except x2go.X2GoSessionException, e:
+except x2go.X2GoSessionException as e:
 self._pyhoca_logger("X2GoSessionException occured:", 
loglevel=x2go.loglevel_ERROR)
 self._pyhoca_logger("-> %s" % str(e), loglevel=x2go.loglevel_ERROR)
diff --git a/setup.py b/setup.py
index 78cdb9da..03e52dca 100755
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2016 by Mike Gabriel 

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 19/94: Continue development

[git-admin]

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 1db41fe7f31a052246a59ec6f494136c6bac8a06
Author: X2Go Release Manager 
Date:   Sun Sep 24 10:50:59 2017 +0200

Continue development
---
 debian/changelog   | 6 ++
 man/man1/pyhoca-cli.1  | 2 +-
 pyhoca-cli.spec| 2 +-
 pyhoca/cli/__init__.py | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3d6c769c..1d43ebd4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pyhoca-cli (0.5.0.5-0x2go1) UNRELEASED; urgency=medium
+
+  * Continue development
+
+ -- X2Go Release Manager   Sun, 24 Sep 2017 10:48:27 +0200
+
 pyhoca-cli (0.5.0.4-0x2go1) unstable; urgency=medium
 
   [ Mihai Moldovan ]
diff --git a/man/man1/pyhoca-cli.1 b/man/man1/pyhoca-cli.1
index c24b6b76..340ebaa8 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 "Jan 2016" "Version 0.5.0.4" "X2Go Application"
+.TH pyhoca-cli 1 "Sep 2017" "Version 0.5.0.5" "X2Go Application"
 .SH NAME
 pyhoca-cli \- X2Go command line client written in Python
 .SH SYNOPSIS
diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec
index 1c4a33ac..c87acb99 100644
--- a/pyhoca-cli.spec
+++ b/pyhoca-cli.spec
@@ -1,5 +1,5 @@
 Name:   pyhoca-cli
-Version:0.5.0.4
+Version:0.5.0.5
 Release:0.0x2go1%{?dist}
 Summary:Command line X2Go client written in Python
 
diff --git a/pyhoca/cli/__init__.py b/pyhoca/cli/__init__.py
index 577344eb..253ec2b4 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.0.4"
+__VERSION__ = "0.5.0.5"
 
 from frontend import *

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 28/94: debian/changelog: Update from Git history

[git-admin]

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 b851c91bb654a803043ac6f69c648376066f4bf8
Author: Mike Gabriel 
Date:   Mon Sep 25 12:50:45 2017 +0200

debian/changelog: Update from Git history
---
 debian/changelog | 9 +
 1 file changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ba56cfd4..51aa0ad2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,15 @@
 pyhoca-cli (0.5.99.0-0x2go1) UNRELEASED; urgency=medium
 
   * Port to Python3.
+  * Bump upstream version to 0.5.99.0.
+  * debian/rules:
++ Build for Python3, not Python2.
+  * 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/{control,compat}: Bump to DH version level 9.
 
  -- Mike Gabriel   Fri, 22 Sep 2017 14:09:18 
+0200
 

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 25/94: debian/control: Fix src:pkg header part.

[git-admin]

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 e344f92374d9e56cb1a20a9c1ffa9ab66d28d2f5
Author: Mike Gabriel 
Date:   Fri Sep 22 14:12:24 2017 +0200

debian/control: Fix src:pkg header part.
---
 debian/control | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index b4ee12c4..402077d8 100644
--- a/debian/control
+++ b/debian/control
@@ -10,17 +10,18 @@ Build-Depends:
  man2html-base | man2html,
  python3 (>=2.6.5-0~),
  python3-setuptools,
- python3-support (>=0.90) | dh-python3
-Standards-Version: 3.9.6
+ python3-support (>=0.90) | 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-Python-Version: >= 2.6
+X-Python3-Version: >= 3.6
 
 Package: pyhoca-cli
 Architecture: all
 Depends:
  ${misc:Depends},
+ ${python3:Depends},
  python3,
  python3-x2go (>=0.6.0.0-0~),
  python3-argparse,

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 22/94: debian/control: Bump versioned D (pyhoca-cli): python-x2go (>= 0.5.99.0).

[git-admin]

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 13503d943728c45e20ad581342b306682754ac9e
Author: Mike Gabriel 
Date:   Fri Sep 22 12:05:58 2017 +0200

debian/control: Bump versioned D (pyhoca-cli): python-x2go (>= 0.5.99.0).
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index fd236656..19de075c 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Architecture: all
 Depends:
  ${misc:Depends},
  python,
- python-x2go (>=0.5.0.0-0~),
+ python-x2go (>=0.6.0.0-0~),
  python-argparse,
  python-setproctitle,
 Suggests:

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 21/94: debian/{control, compat}: Bump to DH version level 9.

[git-admin]

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 ff718bc5525f3a07db63ddc05fa15dc9e5e08a1b
Author: Mike Gabriel 
Date:   Fri Sep 22 12:05:24 2017 +0200

debian/{control,compat}: Bump to DH version level 9.
---
 debian/compat  | 2 +-
 debian/control | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/compat b/debian/compat
index 7f8f011e..ec635144 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 6e86c744..fd236656 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders:
  Mike Gabriel ,
  Mihai Moldovan ,
 Build-Depends:
- debhelper (>= 7.0.50~),
+ debhelper (>= 9),
  man2html-base | man2html,
  python (>=2.6.5-0~),
  python-setuptools,

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 23/94: debian/control: White-space fix.

[git-admin]

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 2d88f3dfd34c6390c18bce37cf3dc8ec4a4c09af
Author: Mike Gabriel 
Date:   Fri Sep 22 12:06:12 2017 +0200

debian/control: White-space fix.
---
 debian/control | 1 -
 1 file changed, 1 deletion(-)

diff --git a/debian/control b/debian/control
index 19de075c..41989596 100644
--- a/debian/control
+++ b/debian/control
@@ -40,4 +40,3 @@ Description: Command line X2Go client written in Python
  PyHoca-CLI provides a simple and flexible command line client
  written in Python that allows you to control X2Go client sessions
  on desktops and thin clients.
-

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 27/94: Bump upstream version to 0.5.99.0.

[git-admin]

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 adba56236911e58c02eb90fa3c4e38b295247bae
Author: Mike Gabriel 
Date:   Fri Sep 22 14:13:52 2017 +0200

Bump upstream version to 0.5.99.0.
---
 debian/changelog   | 6 +++---
 debian/control | 2 +-
 pyhoca/cli/__init__.py | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1d43ebd4..ba56cfd4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-pyhoca-cli (0.5.0.5-0x2go1) UNRELEASED; urgency=medium
+pyhoca-cli (0.5.99.0-0x2go1) UNRELEASED; urgency=medium
 
-  * Continue development
+  * Port to Python3.
 
- -- X2Go Release Manager   Sun, 24 Sep 2017 10:48:27 +0200
+ -- Mike Gabriel   Fri, 22 Sep 2017 14:09:18 
+0200
 
 pyhoca-cli (0.5.0.4-0x2go1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 402077d8..29db8833 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Depends:
  ${misc:Depends},
  ${python3:Depends},
  python3,
- python3-x2go (>=0.6.0.0-0~),
+ python3-x2go (>=0.5.99.0-0~),
  python3-argparse,
  python3-setproctitle,
 Suggests:
diff --git a/pyhoca/cli/__init__.py b/pyhoca/cli/__init__.py
index f03b6679..bebfe4aa 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.0.5"
+__VERSION__ = "0.5.99.0"
 
 from .frontend import *

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 14/94: pyhoca-cli.spec: SLE support: add --prefix to setup.py install call.

[git-admin]

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 183ad7473f48351ac315c892a4bdef394bb5e898
Author: Mihai Moldovan 
Date:   Wed Jun 15 19:41:56 2016 +0200

pyhoca-cli.spec: SLE support: add --prefix to setup.py install call.

Otherwise, data will land in /usr/local/.
---
 debian/changelog | 2 ++
 pyhoca-cli.spec  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 52d09390..14392d4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ pyhoca-cli (0.5.0.4-0x2go1) UNRELEASED; urgency=medium
   * pyhoca-cli.spec:
 - Add support for EPEL5 and (older) SLE versions by using the BuildRoot
   tag.
+- SLE support: add --prefix to setup.py install call. Otherwise, data will
+  land in /usr/local/.
 
  -- X2Go Release Manager   Thu, 28 Jan 2016 21:24:29 +0100
 
diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec
index 5b67a625..1c4a33ac 100644
--- a/pyhoca-cli.spec
+++ b/pyhoca-cli.spec
@@ -55,7 +55,7 @@ on desktops and thin clients.
 
 
 %install
-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+%{__python} setup.py install -O1 --skip-build --prefix %{_prefix} --root 
%{buildroot}
 mkdir -p %{buildroot}/%{_bindir}/
 cp -p %{name} %{buildroot}/%{_bindir}/
 mkdir -p %{buildroot}/%{_mandir}/

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 13/94: pyhoca-cli.spec: add support for EPEL5 and (older) SLE versions by using the BuildRoot tag.

[git-admin]

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 8d36f31eee4cdb467e5c1a98698da23971a4c835
Author: Mihai Moldovan 
Date:   Wed Jun 15 19:29:30 2016 +0200

pyhoca-cli.spec: add support for EPEL5 and (older) SLE versions by using 
the BuildRoot tag.
---
 debian/changelog | 3 +++
 pyhoca-cli.spec  | 7 +++
 2 files changed, 10 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7dc2fed5..52d09390 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ pyhoca-cli (0.5.0.4-0x2go1) UNRELEASED; urgency=medium
   * New upstream version (0.5.0.4):
   * debian/control:
 - Maintainer change in package: X2Go Developers .
+  * pyhoca-cli.spec:
+- Add support for EPEL5 and (older) SLE versions by using the BuildRoot
+  tag.
 
  -- X2Go Release Manager   Thu, 28 Jan 2016 21:24:29 +0100
 
diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec
index 18ca2de8..5b67a625 100644
--- a/pyhoca-cli.spec
+++ b/pyhoca-cli.spec
@@ -24,6 +24,13 @@ Requires:   python-setproctitle
 Requires:   python-x2go >= 0.5.0.0
 Requires:   python-argparse
 
+%if 0%{?el5}
+# For compatibility with EPEL5
+BuildRoot:  %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XX)
+%else
+BuildRoot:  %{_tmppath}/%{name}-%{version}-build
+%endif
+
 %description
 X2Go is a server based computing environment with:
- session resuming

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-tags] [x2goclient] annotated tag 0.4.0.2 created (now 240d844b)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to annotated tag 0.4.0.2
in repository x2goclient.

at  240d844b  (tag)
   tagging  3c27e63bc22fc2d366142f5113ddc97ff0e42ecc (commit)
  replaces  0.4.0.0
 tagged by  Mike Gabriel
on  Wed Jan 8 21:12:51 2014 +0100

- Log -
Upstream version 0.4.0.2
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAABCAAGBQJSzbFDAAoJEJr0azAldxsxG3wQAKhi9Oy/IOMkqFtBOnJRBjrw
6yfmiFlNAODe448eQSKkNeMSZGeMZlgXqB8EOZti37G0jNboyvANI7Ims7l7UPXK
lte1Sr+AOmCMyU9IaIUGr/NTQEPulUv2bQwW7BW5kehVBbf8mAvxxZPrnefEhf5c
Wv/Ip283ukfvX4sm2xwPjf0fWyu3INCeMkKlclklTQWC48i7nqpbiwHEdBsc7xKQ
njhW6b6zabOrKlAf4BCHg986cWvKlKKjzELx3kVvobMDD5c8kZZHWn/f+/7Aqlkb
xGVxiWqHQmtPeiDlPTPPcsqKT4LbDyz45R0HuOx+eZEL9E0EgwvlAXiCI9mvTBfa
NLteiYgrwC1Ni0fqew7jLr7wvoKAxWH0MZQv0T+I5PDTFToztZpXhe7+cYjdDUbQ
uzvrNYATIrfVNl4GBELygwzQDDKQ/Rt13X/SaiRTP3lL4TBQFG47ydDrTo3Pvuku
DGZjKmcc0DqoRwqEcaGdsspbfDbYuRhmw0QjDYl429V+t1W11lQ+PHWVIyNzwnLY
tI/1nHWTZTsgmN4oPeBtYrmCtpZmdTLJmC4On37yH1aXeGbrAcE+I6En2NkOvTxO
zGrDcB4Sq0UA8TTBIzkLa9gcJ/UqA79eVboBhvKRotvzgBaopDSSTF+2JzN/KjYQ
i18HnIdQv7KwJ8Dv+sys
=+mFt
-END PGP SIGNATURE-

Mike Gabriel (11):
  Bump egg version to 0.4.0.1
  release 0.4.0.1
  Continue development...
  Add support for unlocking encrypted SSH private key files.
  /debian/control: Replace "LDAP support" with "session brokerage support" 
in LONG_DESCRIPTION.
  Versioned Depends: on python-x2go (>= 0.4.0.9-0~).
  debian/source/format: Switch to format 1.0.
  change versioning scheme
  pyhoca-cli.spec: Ship pyhoca-cli.spec (RPM package definitions) in 
upstream project. (Thanks to the Fedora package maintainers).
  Add to BR: python-argparse.
  release 0.4.0.2

---

No new revisions were added by this update.

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-tags mailing list
x2go-tags@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-tags

[X2Go-Commits] [x2goclient] 18/94: release 0.5.0.4

[git-admin]

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 87b6c71c4966ca9abf7139e39c3d122143dded80
Author: X2Go Release Manager 
Date:   Sun Sep 24 09:55:55 2017 +0200

release 0.5.0.4
---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 44694865..3d6c769c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-pyhoca-cli (0.5.0.4-0x2go1) UNRELEASED; urgency=medium
+pyhoca-cli (0.5.0.4-0x2go1) unstable; urgency=medium
 
   [ Mihai Moldovan ]
   * New upstream version (0.5.0.4):
@@ -15,7 +15,7 @@ pyhoca-cli (0.5.0.4-0x2go1) UNRELEASED; urgency=medium
 - SLE support: add --prefix to setup.py install call. Otherwise, data will
   land in /usr/local/.
 
- -- X2Go Release Manager   Thu, 28 Jan 2016 21:24:29 +0100
+ -- X2Go Release Manager   Sun, 24 Sep 2017 09:55:15 +0200
 
 pyhoca-cli (0.5.0.3-0x2go1) unstable; urgency=medium
 

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 11/94: Continue development...

[git-admin]

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 b0940ee3bb914b224e3eb41c308f2bd296e73735
Author: X2Go Release Manager 
Date:   Thu Jan 28 21:24:54 2016 +0100

Continue development...
---
 debian/changelog   | 6 ++
 man/man1/pyhoca-cli.1  | 2 +-
 pyhoca-cli.spec| 2 +-
 pyhoca/cli/__init__.py | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c28a6f11..f2333c58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pyhoca-cli (0.5.0.4-0x2go1) UNRELEASED; urgency=medium
+
+  * Continue development...
+
+ -- X2Go Release Manager   Thu, 28 Jan 2016 21:24:29 +0100
+
 pyhoca-cli (0.5.0.3-0x2go1) unstable; urgency=medium
 
   [ Mihai Moldovan ]
diff --git a/man/man1/pyhoca-cli.1 b/man/man1/pyhoca-cli.1
index 716fb598..e7fa5484 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 "Jan 2016" "Version 0.5.0.3" "X2Go Application"
+.TH pyhoca-cli 1 "Jan 2016" "Version 0.5.0.4" "X2Go Application"
 .SH NAME
 pyhoca-cli \- X2Go command line client written in Python
 .SH SYNOPSIS
diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec
index bd735ef8..18ca2de8 100644
--- a/pyhoca-cli.spec
+++ b/pyhoca-cli.spec
@@ -1,5 +1,5 @@
 Name:   pyhoca-cli
-Version:0.5.0.3
+Version:0.5.0.4
 Release:0.0x2go1%{?dist}
 Summary:Command line X2Go client written in Python
 
diff --git a/pyhoca/cli/__init__.py b/pyhoca/cli/__init__.py
index f5972f4a..577344eb 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.0.3"
+__VERSION__ = "0.5.0.4"
 
 from frontend import *

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits