x2go-commits

x2go-commits@lists.x2go.org

37909 discussions

[x2goclient] 17/24: increment __init__.py version
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.2.0.3 in repository x2goclient. commit 3603cde0e2f1255d4a3e3265017e2a3e7a11cb67 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Jun 8 23:44:27 2012 +0200 increment __init__.py version --- pyhoca/cli/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyhoca/cli/__init__.py b/pyhoca/cli/__init__.py index ee5cac60..9f7fef97 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.2.0.0" +__VERSION__ = "0.2.0.1" from frontend import * -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 10/24: lintian issue fixed: extra-license-file
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.2.0.3 in repository x2goclient. commit 9f561faf26e0828f77e078d122d9880520aadbb3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Apr 12 11:24:42 2012 +0200 lintian issue fixed: extra-license-file --- debian/pyhoca-cli.docs | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/pyhoca-cli.docs b/debian/pyhoca-cli.docs index 0199bc07..efae7f1a 100644 --- a/debian/pyhoca-cli.docs +++ b/debian/pyhoca-cli.docs @@ -1,4 +1,3 @@ README TODO -LICENSE.txt .build_man2html/html \ No newline at end of file -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 11/24: Add __doc__ strings to __init__.py and frontend.py.
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.2.0.3 in repository x2goclient. commit b7fa23be3f50174817a11036b085ad8a54ba7f99 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Jun 8 23:12:00 2012 +0200 Add __doc__ strings to __init__.py and frontend.py. --- debian/changelog | 1 + pyhoca/cli/__init__.py | 7 ++++- pyhoca/cli/frontend.py | 78 ++++++++++++++++++++++++++++++++++++++++++-------- 3 files changed, 73 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index b4461ba0..a367c02e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ pyhoca-cli (0.1.4.3-0~x2go1) UNRELEASED; urgency=low * Add python-suport (>=0.90) as dependency. Fix project name in control file. * Add proper license to copyright file. + * Add __doc__ strings to __init__.py and frontend.py. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 07 Sep 2011 20:32:00 +0200 diff --git a/pyhoca/cli/__init__.py b/pyhoca/cli/__init__.py index d7fb69bc..f24d940f 100644 --- a/pyhoca/cli/__init__.py +++ b/pyhoca/cli/__init__.py @@ -18,7 +18,12 @@ # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. """\ -STILL UNDOCUMENTED +PyHoca-CLI is a simple command-line tool that allows the launching of +X2Go sessions. + +For further information on X2Go, please visit the X2Go wiki: +http://wiki.x2go.org + """ __VERSION__ = "0.1.4.3" diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index d79bcd43..b957faec 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -64,7 +64,8 @@ def runtime_error(m, parser=None, exitcode=-1): class PyHocaCLI(x2go.X2goClient): """\ - STILL UNDOCUMENTED + L{PyHocaCLI} is a command-line X2Go Client wrapping around Python X2Go (C{X2goClient} class). + """ x2go_session_hash = None @@ -75,7 +76,13 @@ class PyHocaCLI(x2go.X2goClient): def list_sessions(self, s_hash): """\ - STILL UNDOCUMENTED + List up server-side available sessions for the logged in user. + + The list of available session is printed to stdout. + + @param s_hash: session UUID + @type s_hash: C{str} + """ # retrieve a session list print @@ -110,7 +117,14 @@ class PyHocaCLI(x2go.X2goClient): def list_desktops(self, s_hash): """\ - STILL UNDOCUMENTED + List up server-side available desktop sessions that are + available for sharing to the logged in user. + + The list of sharable desktop sessions is printed to stdout. + + @param s_hash: session UUID + @type s_hash: C{str} + """ # retrieve a desktop list print @@ -129,6 +143,12 @@ class PyHocaCLI(x2go.X2goClient): print def list_profiles(self): + """\ + List up client-side configured session profile configurations. + + The list of session profiles is printed to stdout. + + """ # retrieve a session list print print "Available X2Go session profiles" @@ -143,7 +163,12 @@ class PyHocaCLI(x2go.X2goClient): def clean_sessions(self, s_hash): """\ - STILL UNDOCUMENTED + Clean all running/suspended sessions on the X2Go server that the session with UUID C{s_hash} + is connected to. + + @param s_hash: session UUID + @type s_hash: C{str} + """ _profiles = self._X2goClient__get_profiles() if self.args.session_profile and _profiles.has_profile(self.args.session_profile): @@ -156,7 +181,11 @@ class PyHocaCLI(x2go.X2goClient): def new_session(self, s_hash): """\ - STILL UNDOCUMENTED + Launch a new X2Go session via the C{X2goSession} object with session UUID C{s_hash}. + + @param s_hash: session UUID + @type s_hash: C{str} + """ # start a new session and run a command self.logger('starting a new X2Go session', loglevel=x2go.loglevel_INFO, ) @@ -186,7 +215,11 @@ class PyHocaCLI(x2go.X2goClient): def resume_session(self, s_hash): """\ - STILL UNDOCUMENTED + Use C{X2goSession} object with session UUID C{s_hash} to resume a server-side suspended X2Go session. + + @param s_hash: session UUID + @type s_hash: C{str} + """ # resume a running session self.logger('resuming X2Go session: %s' % self.args.resume, loglevel=x2go.loglevel_INFO, ) @@ -202,7 +235,11 @@ class PyHocaCLI(x2go.X2goClient): def share_desktop_session(self, s_hash): """\ - STILL UNDOCUMENTED + Use C{X2goSession} object with session UUID C{s_hash} to share a server-side X2Go desktop session that is available for sharing. + + @param s_hash: session UUID + @type s_hash: C{str} + """ # start a new session and run a command _desktop = self.args.share_desktop @@ -216,7 +253,11 @@ class PyHocaCLI(x2go.X2goClient): def suspend_session(self, s_hash): """\ - STILL UNDOCUMENTED + Suspend X2Go Session object with session UUID C{s_hash}. + + @param s_hash: session UUID + @type s_hash: C{str} + """ # send a suspend request to a session self.logger('requesting X2Go session suspend of session: %s' % self.args.suspend, loglevel=x2go.loglevel_INFO, ) @@ -241,7 +282,10 @@ class PyHocaCLI(x2go.X2goClient): def terminate_session(self, s_hash): """\ - STILL UNDOCUMENTED + Terminate X2Go Session with session UUID C{s_hash}. + + @param s_hash: session UUID + @type s_hash: C{str} """ # send a terminate request to a session @@ -267,7 +311,16 @@ class PyHocaCLI(x2go.X2goClient): def __init__(self, args, logger=None, liblogger=None): """\ - STILL UNDOCUMENTED + L{PyHocaCLI} Class constructor. + + @param args: a class with properties representing the command-line options that are available to L{PyHocaCLI} instances. + @type args: C{argparse.ArgumentParser} (or similar) + @param logger: you can pass an L{X2goLogger} object to the + L{PyHocaCLI} constructor for logging application events + @type logger: Python X2Go C{X2goLogger} instance + @param liblogger: you can pass an L{X2goLogger} object to the + L{PyHocaCLI} constructor for logging application events, this object is forwarded to the C{X2goClient} class in Python X2Go + @type liblogger: Python X2Go C{X2goLogger} instance """ self.args = args @@ -342,7 +395,8 @@ class PyHocaCLI(x2go.X2goClient): def authenticate(self): """\ - STILL UNDOCUMENTED + Authenticate this L{PyHocaCLI} instance with the remote X2Go server. + """ connected = False force_password_auth = False @@ -390,7 +444,7 @@ class PyHocaCLI(x2go.X2goClient): def MainLoop(self): """\ - STILL UNDOCUMENTED + Start the main loop of this application. """ try: -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 12/24: bump upstream version to 0.2.0.0
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.2.0.3 in repository x2goclient. commit 1bcc08fb10945c8d9d3c59714cd9622adc17745c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Jun 8 23:12:45 2012 +0200 bump upstream version to 0.2.0.0 --- debian/changelog | 2 +- pyhoca/cli/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a367c02e..d01227e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -pyhoca-cli (0.1.4.3-0~x2go1) UNRELEASED; urgency=low +pyhoca-cli (0.2.0.0-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.1.4.3): - Replace non-code strings ,,X2go'' by ,,X2Go''. diff --git a/pyhoca/cli/__init__.py b/pyhoca/cli/__init__.py index f24d940f..ee5cac60 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.1.4.3" +__VERSION__ = "0.2.0.0" from frontend import * -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 13/24: Depend on Python X2Go (>= 0.2.0.2).
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.2.0.3 in repository x2goclient. commit a7e4fe050770a7082ec89b46e30a263856f0c6ce Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Jun 8 23:13:34 2012 +0200 Depend on Python X2Go (>= 0.2.0.2). --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d01227e2..4c76acfd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ pyhoca-cli (0.2.0.0-0~x2go1) UNRELEASED; urgency=low file. * Add proper license to copyright file. * Add __doc__ strings to __init__.py and frontend.py. + * Depend on Python X2Go (>= 0.2.0.2). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 07 Sep 2011 20:32:00 +0200 diff --git a/debian/control b/debian/control index 19c07d2d..96d3166b 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,7 @@ Architecture: all Depends: ${misc:Depends}, python, - python-x2go (>=0.1.1.2-0~), + python-x2go (>=0.2.0.2-0~), python-argparse, python-setproctitle, python-support (>=0.90) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 08/24: license change to AGPLv3+
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.2.0.3 in repository x2goclient. commit c522c0a7e5bce527de073a51db4adb165f3e9d69 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Apr 12 01:08:30 2012 +0200 license change to AGPLv3+ --- debian/copyright | 11 ++++++----- debian/pyhoca-cli.docs | 1 + debian/rules | 2 +- setup.py | 6 +++--- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/debian/copyright b/debian/copyright index 95295add..9e0534c5 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -pyhoca-cli - Copyright (C) 2010 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +pyhoca-cli - Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> 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 @@ -16,13 +16,14 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. Published under the terms of the GNU Affero General Public License. -See http://www.gnu.org/licenses/gpl.html for a recent copy. - -On Debian systems a local copy of the GPL license can also be -found in /usr/share/common-licenses. +See http://www.gnu.org/licenses/agpl-3.0.txt for a recent copy. The code has been packaged for Debian by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +For the contained packaging files for Debian/Ubuntu, however, the +,,normal'' GNU General Public License (version 3 or higher) applies. +A copy of this license can also be found at /usr/share/common-licenses/. + light+love, Mike Gabriel diff --git a/debian/pyhoca-cli.docs b/debian/pyhoca-cli.docs index efae7f1a..0199bc07 100644 --- a/debian/pyhoca-cli.docs +++ b/debian/pyhoca-cli.docs @@ -1,3 +1,4 @@ README TODO +LICENSE.txt .build_man2html/html \ No newline at end of file diff --git a/debian/rules b/debian/rules index f4ddccc9..0c539067 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 by Mike Gabriel +# Copyright 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> PYVERS=$(shell pyversions -vr) diff --git a/setup.py b/setup.py index 6f04946d..b3f0120e 100755 --- a/setup.py +++ b/setup.py @@ -22,10 +22,10 @@ from setuptools import setup, find_packages import pyhoca.cli setup( - name = "PyHoca CLI", + name = "PyHoca-CLI", version = pyhoca.cli.__VERSION__, - description = "PyHoca CLI is a cross-platform (Windows, MacOS X, Linux) X2Go client for the command line.", - license = 'GPL', + description = "PyHoca-CLI is a cross-platform (Windows, MacOS X, Linux) X2Go client for the command line.", + license = 'AGPLv3+', author = 'Mike Gabriel', url = 'http://www.x2go.org', packages = [ 'pyhoca.cli', ], -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 09/24: add AGPLv3+ full text license
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.2.0.3 in repository x2goclient. commit fe3fea0defb27ae346f115dd3891c36581db6d17 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Apr 12 02:42:40 2012 +0200 add AGPLv3+ full text license --- LICENSE.txt | 661 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 661 insertions(+) diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 00000000..dba13ed2 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +<http://www.gnu.org/licenses/>. -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 06/24: happy new year, license change to AGPLv3+
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.2.0.3 in repository x2goclient. commit c9127546eb02e1633969f363697a98c009e6a386 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Apr 12 00:43:07 2012 +0200 happy new year, license change to AGPLv3+ --- Makefile.docupload | 2 +- README | 4 ++-- TODO | 4 ++-- debian/copyright | 8 ++++---- debian/rules | 0 man/man1/pyhoca-cli.1 | 2 +- pyhoca-cli | 8 ++++---- pyhoca/__init__.py | 8 ++++---- pyhoca/cli/__init__.py | 8 ++++---- pyhoca/cli/frontend.py | 8 ++++---- setup.py | 8 ++++---- 11 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Makefile.docupload b/Makefile.docupload index 1a6c71dd..825b3199 100644 --- a/Makefile.docupload +++ b/Makefile.docupload @@ -1,6 +1,6 @@ #!/usr/bin/make -f # Makefile.docupload file - for pyhoca-cli -# Copyright 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, GPLv3 applies to this file +# Copyright 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, 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 84cba905..f513376a 100644 --- a/README +++ b/README @@ -1,10 +1,10 @@ -pyhoca-cli - Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +pyhoca-cli - Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Contributors: Jörg Sawatzki <joerg.sawatzki(a)web.de> Dick Kniep <dick.kniep(a)lindix.nl> -Published under the terms of the GNU General Public License. +Published under the terms of the GNU Affero General Public License. See http://www.gnu.org/licenses/gpl.html for a recent copy. diff --git a/TODO b/TODO index 93bcd202..685f653f 100644 --- a/TODO +++ b/TODO @@ -1,10 +1,10 @@ -pyhoca-cli - Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +pyhoca-cli - Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Contributors: Jörg Sawatzki <joerg.sawatzki(a)web.de> Dick Kniep <dick.kniep(a)lindix.nl> -Published under the terms of the GNU General Public License. +Published under the terms of the GNU Affero General Public License. See http://www.gnu.org/licenses/gpl.html for a recent copy. diff --git a/debian/copyright b/debian/copyright index c07c5340..95295add 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,21 +1,21 @@ pyhoca-cli - Copyright (C) 2010 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> PyHoca-CLI is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by +it under the terms of the GNU Affero General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. PyHoca-CLI is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +GNU Affero General Public License for more details. -You should have received a copy of the GNU General Public License +You should have received a copy of the GNU Affero General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -Published under the terms of the GNU General Public License. +Published under the terms of the GNU Affero General Public License. See http://www.gnu.org/licenses/gpl.html for a recent copy. On Debian systems a local copy of the GPL license can also be diff --git a/debian/rules b/debian/rules old mode 100755 new mode 100644 diff --git a/man/man1/pyhoca-cli.1 b/man/man1/pyhoca-cli.1 index efbc0333..9590cbef 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 "07 Sep 2011" "Version 0.1.4.x" "X2Go Application" +.TH pyhoca-cli 1 "Apr 2012" "Version 0.1.4.x" "X2Go Application" .SH NAME pyhoca-cli \- X2Go command line client written in Python .SH SYNOPSIS diff --git a/pyhoca-cli b/pyhoca-cli old mode 100755 new mode 100644 index cd7f62d2..fcd02fb2 --- a/pyhoca-cli +++ b/pyhoca-cli @@ -1,19 +1,19 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -# Copyright (C) 2010 by Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # PyHoca CLI is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by +# it under the terms of the GNU Affero General Public License as published by # the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # PyHoca CLI is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# GNU Affero General Public License for more details. # -# You should have received a copy of the GNU General Public License +# You should have received a copy of the GNU Affero General Public License # along with this program; if not, write to the # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/pyhoca/__init__.py b/pyhoca/__init__.py index 6204815a..23f929b8 100644 --- a/pyhoca/__init__.py +++ b/pyhoca/__init__.py @@ -1,18 +1,18 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010 by Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # PyHoca CLI is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by +# it under the terms of the GNU Affero General Public License as published by # the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # PyHoca CLI is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# GNU Affero General Public License for more details. # -# You should have received a copy of the GNU General Public License +# You should have received a copy of the GNU Affero General Public License # along with this program; if not, write to the # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/pyhoca/cli/__init__.py b/pyhoca/cli/__init__.py index bb65c60c..d7fb69bc 100644 --- a/pyhoca/cli/__init__.py +++ b/pyhoca/cli/__init__.py @@ -1,18 +1,18 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010 by Dick Kniep <m.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # PyHoca CLI is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by +# it under the terms of the GNU Affero General Public License as published by # the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # PyHoca CLI is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# GNU Affero General Public License for more details. # -# You should have received a copy of the GNU General Public License +# You should have received a copy of the GNU Affero General Public License # along with this program; if not, write to the # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 5d650a3b..d79bcd43 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -1,18 +1,18 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010 by Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # PyHoca CLI is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by +# it under the terms of the GNU Affero General Public License as published by # the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # PyHoca CLI is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# GNU Affero General Public License for more details. # -# You should have received a copy of the GNU General Public License +# You should have received a copy of the GNU Affero General Public License # along with this program; if not, write to the # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/setup.py b/setup.py old mode 100755 new mode 100644 index 204f8d70..6f04946d --- a/setup.py +++ b/setup.py @@ -1,19 +1,19 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2010 by Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # PyHoca is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by +# it under the terms of the GNU Affero General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # PyHoca is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# GNU Affero General Public License for more details. # -# You should have received a copy of the GNU General Public License +# You should have received a copy of the GNU Affero General Public License # along with this program; if not, write to the # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 05/24: Add code to redirect stdout and stderr when frozen with py2exe.
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.2.0.3 in repository x2goclient. commit 844198f8829e6d23d69ffa9bc092ca560ab73c35 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Apr 11 10:04:43 2012 +0200 Add code to redirect stdout and stderr when frozen with py2exe. --- debian/changelog | 1 + pyhoca-cli | 41 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index db59077d..b4461ba0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ pyhoca-cli (0.1.4.3-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.1.4.3): - Replace non-code strings ,,X2go'' by ,,X2Go''. + - Add code to redirect stdout and stderr when frozen with py2exe. * Add python-suport (>=0.90) as dependency. Fix project name in control file. * Add proper license to copyright file. diff --git a/pyhoca-cli b/pyhoca-cli index a21fe0a0..cd7f62d2 100755 --- a/pyhoca-cli +++ b/pyhoca-cli @@ -30,13 +30,50 @@ import x2go import sys import os + +import sys +import os + +PROG_NAME = os.path.basename(sys.argv[0]).replace('.exe', '') +PROG_PID = os.getpid() + +if hasattr(sys, 'frozen') and sys.frozen in ("windows_exe", "console_exe"): + class Win32_Logging(object): + + softspace = 0 + _fname = os.path.join(os.environ['AppData'], PROG_NAME, '%s.log' % PROG_NAME) + _file = None + + def __init__(self, filemode='a'): + self._filemode = filemode + + def write(self, text, **kwargs): + if self._file is None: + try: + try: + os.mkdir(os.path.dirname(self._fname)) + except: + pass + self._file = open(self._fname, self._filemode) + except: + pass + else: + self._file.write(text) + self._file.flush() + + def flush(self): + if self._file is not None: + self._file.flush() + + sys.stdout = Win32_Logging(filemode='w+') + sys.stderr = Win32_Logging(filemode='a') + del Win32_Logging + app = sys.argv[0] if app.startswith('./'): sys.path.insert(0, os.path.join(os.path.dirname(__file__))) os.environ['PYTHONX2GO_LOCAL'] = '1' -PROG_NAME = os.path.basename(sys.argv[0]) -PROG_PID = os.getpid() PROG_OPTIONS = sys.argv[1:] try: _password_index = PROG_OPTIONS.index('--password')+1 -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 07/24: fix file permissions (x-bit)
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.2.0.3 in repository x2goclient. commit 9c63db33b0b31598afb9c0dee92131649c93528b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Apr 12 00:43:44 2012 +0200 fix file permissions (x-bit) --- debian/rules | 0 pyhoca-cli | 0 setup.py | 0 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/debian/rules b/debian/rules old mode 100644 new mode 100755 diff --git a/pyhoca-cli b/pyhoca-cli old mode 100644 new mode 100755 diff --git a/setup.py b/setup.py old mode 100644 new mode 100755 -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits