x2go-commits

x2go-commits@lists.x2go.org

1 participants
37903 discussions

x2goserver.git - master (branch) updated: 3.0.99-2-258-g90306c5
by git-admin＠x2go.org 10 Sep '11

10 Sep '11

The branch, master has been updated via 90306c53fdae801cd45c9f581455026e386d6cf0 (commit) from 4782010113b7e267ef7404da7179a9c3c6289dbf (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 90306c53fdae801cd45c9f581455026e386d6cf0 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Sep 10 15:55:21 2011 +0200 Rename example user and group for session limits in x2goserver.conf so that people do not get the idea to put users in x2gouser group. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2goserver/etc/x2goserver.conf | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 1b9f5dd..0de56ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -52,6 +52,8 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low * Add notice messages for start, suspend, resume, terminate, mountdirs actions. * Cleanup of man page area, thanks to Ivan Kabaivanov for pointing that out. + * Rename example user and group for session limits in x2goserver.conf so that + people do not get the idea to put users in x2gouser group. [ Ivan Kabaivanov ] * Makefile fix around man page installation in x2goserver-compat package. diff --git a/x2goserver/etc/x2goserver.conf b/x2goserver/etc/x2goserver.conf index 61312ee..5fa6baf 100644 --- a/x2goserver/etc/x2goserver.conf +++ b/x2goserver/etc/x2goserver.conf @@ -1,8 +1,8 @@ [limit users] -#beispielb=1 +#user-foo=1 [limit groups] -#x2gousers=1 +#bar-group=1 [log] # possible levels are: emerg, alert, crit, err, warning, notice, info, debug hooks/post-receive -- x2goserver.git (X2go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2go Server).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-257-g4782010
by git-admin＠x2go.org 10 Sep '11

10 Sep '11

The branch, master has been updated via 4782010113b7e267ef7404da7179a9c3c6289dbf (commit) via 6aefbf4538b55ca5dc3c5748238b0203f9db180c (commit) from f12dab5a48c70cd32a54ddb5418948bd28dad2b1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 4782010113b7e267ef7404da7179a9c3c6289dbf Author: Ivan Kabaivanov <chepati(a)yahoo.com> Date: Sat Sep 10 15:51:19 2011 +0200 Makefile fix around man page installation in x2goserver-compat package. commit 6aefbf4538b55ca5dc3c5748238b0203f9db180c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Sep 10 14:38:24 2011 +0200 Cleanup of man page area, thanks to Ivan Kabaivanov for pointing that out. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 +++ debian/x2goserver.manpages | 1 - x2goserver-compat/Makefile | 8 ++---- x2goserver/Makefile | 5 ---- x2goserver/man/man1/x2gobasepath.1 | 25 ------------------- x2goserver/man/man1/x2gocmdexitmessage.1 | 22 ----------------- x2goserver/man/man1/x2golistdesktops.1 | 22 ----------------- x2goserver/man/man1/x2golistsessions.1 | 22 ----------------- x2goserver/man/man1/x2gomountdirs.1 | 22 ----------------- x2goserver/man/man1/x2goprint.1 | 22 ----------------- x2goserver/man/man1/x2goresume-session.1 | 22 ----------------- x2goserver/man/man1/x2goruncommand.1 | 22 ----------------- x2goserver/man/man1/x2gosessionlimit.1 | 22 ----------------- x2goserver/man/man1/x2goshowblocks.1 | 22 ----------------- x2goserver/man/man1/x2gostartagent.1 | 35 --------------------------- x2goserver/man/man1/x2gosuspend-session.1 | 22 ----------------- x2goserver/man/man1/x2goterminate-session.1 | 22 ----------------- x2goserver/man/man1/x2goumount-session.1 | 22 ----------------- x2goserver/man/man1/x2goumount_session.1 | 1 - x2goserver/man/man8/x2goumount_session.8 | 1 + 20 files changed, 8 insertions(+), 336 deletions(-) delete mode 100644 x2goserver/man/man1/x2gobasepath.1 delete mode 100644 x2goserver/man/man1/x2gocmdexitmessage.1 delete mode 100644 x2goserver/man/man1/x2golistdesktops.1 delete mode 100644 x2goserver/man/man1/x2golistsessions.1 delete mode 100644 x2goserver/man/man1/x2gomountdirs.1 delete mode 100644 x2goserver/man/man1/x2goprint.1 delete mode 100644 x2goserver/man/man1/x2goresume-session.1 delete mode 100644 x2goserver/man/man1/x2goruncommand.1 delete mode 100644 x2goserver/man/man1/x2gosessionlimit.1 delete mode 100644 x2goserver/man/man1/x2goshowblocks.1 delete mode 100644 x2goserver/man/man1/x2gostartagent.1 delete mode 100644 x2goserver/man/man1/x2gosuspend-session.1 delete mode 100644 x2goserver/man/man1/x2goterminate-session.1 delete mode 100644 x2goserver/man/man1/x2goumount-session.1 delete mode 120000 x2goserver/man/man1/x2goumount_session.1 create mode 120000 x2goserver/man/man8/x2goumount_session.8 The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 8aded28..1b9f5dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -51,6 +51,10 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low * Use usermapping for SSHFS mount points. * Add notice messages for start, suspend, resume, terminate, mountdirs actions. + * Cleanup of man page area, thanks to Ivan Kabaivanov for pointing that out. + + [ Ivan Kabaivanov ] + * Makefile fix around man page installation in x2goserver-compat package. [ Martin Oehler ] * Removes old debug code fragment, fixes x2golistsessions parsing. diff --git a/debian/x2goserver.manpages b/debian/x2goserver.manpages index d70a25f..88720a8 100644 --- a/debian/x2goserver.manpages +++ b/debian/x2goserver.manpages @@ -1,2 +1 @@ -x2goserver/man/man1/* x2goserver/man/man8/* \ No newline at end of file diff --git a/x2goserver-compat/Makefile b/x2goserver-compat/Makefile index b6651c5..470dde7 100755 --- a/x2goserver-compat/Makefile +++ b/x2goserver-compat/Makefile @@ -66,9 +66,9 @@ install_config: install_man: $(INSTALL_DIR) $(DESTDIR)$(MANDIR) - $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man1 - $(INSTALL_FILE) man/man1/*.1 $(DESTDIR)$(MANDIR)/man1 - gzip -f $(DESTDIR)$(MANDIR)/man1/x2go*.1 + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8 + $(INSTALL_FILE) man/man1/*.8 $(DESTDIR)$(MANDIR)/man8 + gzip -f $(DESTDIR)$(MANDIR)/man1/x2go*.8 install_version: $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) @@ -91,8 +91,6 @@ uninstall_config: # $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql || true uninstall_man: - for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man1/$$file.1.gz; done - for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man1/$$file.1.gz; done for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.8.gz; done for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.8.gz; done $(RM_DIR) $(DESTDIR)$(MANDIR) || true diff --git a/x2goserver/Makefile b/x2goserver/Makefile index 71cced9..0bf496c 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -78,9 +78,6 @@ install_config: install_man: $(INSTALL_DIR) $(DESTDIR)$(MANDIR) - $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man1 - $(INSTALL_FILE) man/man1/*.1 $(DESTDIR)$(MANDIR)/man1 - gzip -f $(DESTDIR)$(MANDIR)/man1/x2go*.1 $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8 $(INSTALL_FILE) man/man8/*.8 $(DESTDIR)$(MANDIR)/man8 gzip -f $(DESTDIR)$(MANDIR)/man8/x2go*.8 @@ -107,8 +104,6 @@ uninstall_config: $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql || true uninstall_man: - for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man1/$$file.1.gz; done - for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man1/$$file.1.gz; done for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.8.gz; done for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.8.gz; done $(RM_DIR) $(DESTDIR)$(MANDIR) || true diff --git a/x2goserver/man/man1/x2gobasepath.1 b/x2goserver/man/man1/x2gobasepath.1 deleted file mode 100644 index cb83fe8..0000000 --- a/x2goserver/man/man1/x2gobasepath.1 +++ /dev/null @@ -1,25 +0,0 @@ -'\" -*- coding: utf-8 -*- -.if \n(.g .ds T< \\FC -.if \n(.g .ds T> \\F[\n[.fam]] -.de URL -\\$2 \(la\\$1\(ra\\$3 -.. -.if \n(.g .mso www.tmac -.TH x2gobasepath 1 "July 2011" "Version 3.0.99.x" "X2go Server Tool" -.SH NAME -x2gobasepath \- X2go Server Helper Script -.SH SYNOPSIS -'nh -.fi -.ad l -x2gobasepath - -.SH DESCRIPTION -\fBx2gobasepath\fR returns (without \\newline) the base path of the current X2go server installation. -Mostly this is /usr or /usr/local. -.PP -This script is used internally by the X2go server. -.PP -.SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project -(http://www.x2go.org). diff --git a/x2goserver/man/man1/x2gocmdexitmessage.1 b/x2goserver/man/man1/x2gocmdexitmessage.1 deleted file mode 100644 index 1c28470..0000000 --- a/x2goserver/man/man1/x2gocmdexitmessage.1 +++ /dev/null @@ -1,22 +0,0 @@ -'\" -*- coding: utf-8 -*- -.if \n(.g .ds T< \\FC -.if \n(.g .ds T> \\F[\n[.fam]] -.de URL -\\$2 \(la\\$1\(ra\\$3 -.. -.if \n(.g .mso www.tmac -.TH x2gocmdexitmessage 1 "July 2011" "Version 3.0.99.x" "X2go Server Tool" -.SH NAME -x2goexitmessage \- X2go Server Script -.SH SYNOPSIS -'nh -.fi -.ad l -x2goexitmessage - -.SH DESCRIPTION -\fBx2goexitmessage\fR is one of many scripts belonging to X2go Server. -.PP -.SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project -(http://www.x2go.org). diff --git a/x2goserver/man/man1/x2golistdesktops.1 b/x2goserver/man/man1/x2golistdesktops.1 deleted file mode 100644 index c1bab38..0000000 --- a/x2goserver/man/man1/x2golistdesktops.1 +++ /dev/null @@ -1,22 +0,0 @@ -'\" -*- coding: utf-8 -*- -.if \n(.g .ds T< \\FC -.if \n(.g .ds T> \\F[\n[.fam]] -.de URL -\\$2 \(la\\$1\(ra\\$3 -.. -.if \n(.g .mso www.tmac -.TH x2golistdesktops 1 "July 2011" "Version 3.0.99.x" "X2go Server Tool" -.SH NAME -x2golistdesktops \- X2go Server Script -.SH SYNOPSIS -'nh -.fi -.ad l -x2golistdesktops - -.SH DESCRIPTION -\fBx2golistdesktops\fR is one of many scripts belonging to X2go Server. -.PP -.SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project -(http://www.x2go.org). diff --git a/x2goserver/man/man1/x2golistsessions.1 b/x2goserver/man/man1/x2golistsessions.1 deleted file mode 100644 index 7dfd17d..0000000 --- a/x2goserver/man/man1/x2golistsessions.1 +++ /dev/null @@ -1,22 +0,0 @@ -'\" -*- coding: utf-8 -*- -.if \n(.g .ds T< \\FC -.if \n(.g .ds T> \\F[\n[.fam]] -.de URL -\\$2 \(la\\$1\(ra\\$3 -.. -.if \n(.g .mso www.tmac -.TH x2golistsessions 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" -.SH NAME -x2golistsessions \- X2go Server Script -.SH SYNOPSIS -'nh -.fi -.ad l -x2golistsessions - -.SH DESCRIPTION -\fBx2golistsessions\fR is one of many scripts belonging to X2go Server. -.PP -.SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project -(http://www.x2go.org). diff --git a/x2goserver/man/man1/x2gomountdirs.1 b/x2goserver/man/man1/x2gomountdirs.1 deleted file mode 100644 index f8bb5f8..0000000 --- a/x2goserver/man/man1/x2gomountdirs.1 +++ /dev/null @@ -1,22 +0,0 @@ -'\" -*- coding: utf-8 -*- -.if \n(.g .ds T< \\FC -.if \n(.g .ds T> \\F[\n[.fam]] -.de URL -\\$2 \(la\\$1\(ra\\$3 -.. -.if \n(.g .mso www.tmac -.TH x2gomountdirs 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" -.SH NAME -x2gomountdirs \- X2go Server Script -.SH SYNOPSIS -'nh -.fi -.ad l -x2gomountdirs - -.SH DESCRIPTION -\fBx2gomountdirs\fR is one of many scripts belonging to X2go Server. -.PP -.SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project -(http://www.x2go.org). diff --git a/x2goserver/man/man1/x2goprint.1 b/x2goserver/man/man1/x2goprint.1 deleted file mode 100644 index d1e09c2..0000000 --- a/x2goserver/man/man1/x2goprint.1 +++ /dev/null @@ -1,22 +0,0 @@ -'\" -*- coding: utf-8 -*- -.if \n(.g .ds T< \\FC -.if \n(.g .ds T> \\F[\n[.fam]] -.de URL -\\$2 \(la\\$1\(ra\\$3 -.. -.if \n(.g .mso www.tmac -.TH x2goprint 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" -.SH NAME -x2goprint \- X2go Server Script -.SH SYNOPSIS -'nh -.fi -.ad l -x2goprint - -.SH DESCRIPTION -\fBx2goprint\fR is one of many scripts belonging to X2go Server. -.PP -.SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project -(http://www.x2go.org). diff --git a/x2goserver/man/man1/x2goresume-session.1 b/x2goserver/man/man1/x2goresume-session.1 deleted file mode 100644 index f12d0a9..0000000 --- a/x2goserver/man/man1/x2goresume-session.1 +++ /dev/null @@ -1,22 +0,0 @@ -'\" -*- coding: utf-8 -*- -.if \n(.g .ds T< \\FC -.if \n(.g .ds T> \\F[\n[.fam]] -.de URL -\\$2 \(la\\$1\(ra\\$3 -.. -.if \n(.g .mso www.tmac -.TH x2goresume-session 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" -.SH NAME -x2goresume-session \- X2go Server Script -.SH SYNOPSIS -'nh -.fi -.ad l -x2goresume-session - -.SH DESCRIPTION -\fBx2goresume-session\fR is one of many scripts belonging to X2go Server. -.PP -.SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project -(http://www.x2go.org). diff --git a/x2goserver/man/man1/x2goruncommand.1 b/x2goserver/man/man1/x2goruncommand.1 deleted file mode 100644 index 145b238..0000000 --- a/x2goserver/man/man1/x2goruncommand.1 +++ /dev/null @@ -1,22 +0,0 @@ -'\" -*- coding: utf-8 -*- -.if \n(.g .ds T< \\FC -.if \n(.g .ds T> \\F[\n[.fam]] -.de URL -\\$2 \(la\\$1\(ra\\$3 -.. -.if \n(.g .mso www.tmac -.TH x2goruncommand 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" -.SH NAME -x2goruncommand \- X2go Server Script -.SH SYNOPSIS -'nh -.fi -.ad l -x2goruncommand - -.SH DESCRIPTION -\fBx2goruncommand\fR is one of many scripts belonging to X2go Server. -.PP -.SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project -(http://www.x2go.org). diff --git a/x2goserver/man/man1/x2gosessionlimit.1 b/x2goserver/man/man1/x2gosessionlimit.1 deleted file mode 100644 index 8e9b70b..0000000 --- a/x2goserver/man/man1/x2gosessionlimit.1 +++ /dev/null @@ -1,22 +0,0 @@ -'\" -*- coding: utf-8 -*- -.if \n(.g .ds T< \\FC -.if \n(.g .ds T> \\F[\n[.fam]] -.de URL -\\$2 \(la\\$1\(ra\\$3 -.. -.if \n(.g .mso www.tmac -.TH x2gosessionlimit 1 "July 2011" "Version 3.0.99.x" "X2go Server Tool" -.SH NAME -x2gosessionlimit \- X2go Server Script -.SH SYNOPSIS -'nh -.fi -.ad l -x2golistsessions - -.SH DESCRIPTION -\fBx2gosessionlimit\fR is one of many scripts belonging to X2go Server. -.PP -.SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project -(http://www.x2go.org). diff --git a/x2goserver/man/man1/x2goshowblocks.1 b/x2goserver/man/man1/x2goshowblocks.1 deleted file mode 100644 index 145b238..0000000 --- a/x2goserver/man/man1/x2goshowblocks.1 +++ /dev/null @@ -1,22 +0,0 @@ -'\" -*- coding: utf-8 -*- -.if \n(.g .ds T< \\FC -.if \n(.g .ds T> \\F[\n[.fam]] -.de URL -\\$2 \(la\\$1\(ra\\$3 -.. -.if \n(.g .mso www.tmac -.TH x2goruncommand 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" -.SH NAME -x2goruncommand \- X2go Server Script -.SH SYNOPSIS -'nh -.fi -.ad l -x2goruncommand - -.SH DESCRIPTION -\fBx2goruncommand\fR is one of many scripts belonging to X2go Server. -.PP -.SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project -(http://www.x2go.org). diff --git a/x2goserver/man/man1/x2gostartagent.1 b/x2goserver/man/man1/x2gostartagent.1 deleted file mode 100644 index 16f0a8c..0000000 --- a/x2goserver/man/man1/x2gostartagent.1 +++ /dev/null @@ -1,35 +0,0 @@ -'\" -*- coding: utf-8 -*- -.if \n(.g .ds T< \\FC -.if \n(.g .ds T> \\F[\n[.fam]] -.de URL -\\$2 \(la\\$1\(ra\\$3 -.. -.if \n(.g .mso www.tmac -.TH x2gostartagent 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" -.SH NAME -x2gostartagent \- X2go Server Script -.SH SYNOPSIS -'nh -.fi -.ad l -x2gostartagent <geometry> <link-quality> <nx-pack-meth> <cache-type+dpi> <kblayout> <kbtype> <setkbd> <session-type> <command> - -.SH DESCRIPTION -\fBx2gostartagent\fR is a script that coordinates the startup process of new X2go sessions. -It expects quite a list of parameters, all of which are obligatory. -.SH RETURN VALUES -A list of parameters will be returned after a successful session startup. Each value will be presented on -a new line: - - \fB<X-display-number>\fR - \fB<session-cookie-hash>\fR - \fB<x2goagent-pid>\fR - \fB<session-name>\fR - \fB<graphics-port>\fR - \fB<sound-port>\fR - \fB<sshfs-port>\fR - -.PP -.SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project -(http://www.x2go.org). diff --git a/x2goserver/man/man1/x2gosuspend-session.1 b/x2goserver/man/man1/x2gosuspend-session.1 deleted file mode 100644 index aeee450..0000000 --- a/x2goserver/man/man1/x2gosuspend-session.1 +++ /dev/null @@ -1,22 +0,0 @@ -'\" -*- coding: utf-8 -*- -.if \n(.g .ds T< \\FC -.if \n(.g .ds T> \\F[\n[.fam]] -.de URL -\\$2 \(la\\$1\(ra\\$3 -.. -.if \n(.g .mso www.tmac -.TH x2gosuspend-session 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" -.SH NAME -x2gosuspend-session \- X2go Server Script -.SH SYNOPSIS -'nh -.fi -.ad l -x2gosuspend-session - -.SH DESCRIPTION -\fBx2gosuspend-session\fR is one of many scripts belonging to X2go Server. -.PP -.SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project -(http://www.x2go.org). diff --git a/x2goserver/man/man1/x2goterminate-session.1 b/x2goserver/man/man1/x2goterminate-session.1 deleted file mode 100644 index 60f53fa..0000000 --- a/x2goserver/man/man1/x2goterminate-session.1 +++ /dev/null @@ -1,22 +0,0 @@ -'\" -*- coding: utf-8 -*- -.if \n(.g .ds T< \\FC -.if \n(.g .ds T> \\F[\n[.fam]] -.de URL -\\$2 \(la\\$1\(ra\\$3 -.. -.if \n(.g .mso www.tmac -.TH x2goterminate-session 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" -.SH NAME -x2goterminate-session \- X2go Server Script -.SH SYNOPSIS -'nh -.fi -.ad l -x2goterminate-session - -.SH DESCRIPTION -\fBx2goterminate-session\fR is one of many scripts belonging to X2go Server. -.PP -.SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project -(http://www.x2go.org). diff --git a/x2goserver/man/man1/x2goumount-session.1 b/x2goserver/man/man1/x2goumount-session.1 deleted file mode 100644 index baef86b..0000000 --- a/x2goserver/man/man1/x2goumount-session.1 +++ /dev/null @@ -1,22 +0,0 @@ -'\" -*- coding: utf-8 -*- -.if \n(.g .ds T< \\FC -.if \n(.g .ds T> \\F[\n[.fam]] -.de URL -\\$2 \(la\\$1\(ra\\$3 -.. -.if \n(.g .mso www.tmac -.TH x2goumount-session 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" -.SH NAME -x2goumount-session \- X2go Server Script -.SH SYNOPSIS -'nh -.fi -.ad l -x2goumount-session - -.SH DESCRIPTION -\fBx2goumount-session\fR is one of many scripts belonging to X2go Server. -.PP -.SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project -(http://www.x2go.org). diff --git a/x2goserver/man/man1/x2goumount_session.1 b/x2goserver/man/man1/x2goumount_session.1 deleted file mode 120000 index 7417601..0000000 --- a/x2goserver/man/man1/x2goumount_session.1 +++ /dev/null @@ -1 +0,0 @@ -x2goumount-session.1 \ No newline at end of file diff --git a/x2goserver/man/man8/x2goumount_session.8 b/x2goserver/man/man8/x2goumount_session.8 new file mode 120000 index 0000000..59dd168 --- /dev/null +++ b/x2goserver/man/man8/x2goumount_session.8 @@ -0,0 +1 @@ +x2goumount-session.8 \ No newline at end of file hooks/post-receive -- x2goserver.git (X2go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2go Server).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-255-gf12dab5
by git-admin＠x2go.org 10 Sep '11

10 Sep '11

The branch, master has been updated via f12dab5a48c70cd32a54ddb5418948bd28dad2b1 (commit) from f7db69b952f84420aa24b8fb1f7c4b47ebaedf50 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f12dab5a48c70cd32a54ddb5418948bd28dad2b1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Sep 10 02:47:17 2011 +0200 loglevel warn has to be warning ----------------------------------------------------------------------- Summary of changes: x2goserver/bin/x2gomountdirs | 4 ++-- x2goserver/etc/x2goserver.conf | 2 +- x2goserver/lib/x2gologlevel.pm | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index dfa627c..18d019f 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -298,7 +298,7 @@ for (my $i=0;$i<@dirs;$i++) { $msg = "mounting of @dirs[$i] failed"; print "$msg\n"; - syslog('warn', "WARNING: $msg"); + syslog('warning', "WARNING: $msg"); db_deletemount( $session, $mntpath); rmdir($mntpath); } @@ -306,7 +306,7 @@ for (my $i=0;$i<@dirs;$i++) else { $msg = "insertion of @dirs[$i] failed (already mounted?), not mounting"; - syslog('warn', "WARNING: $msg"); + syslog('warning', "WARNING: $msg"); print "$msg\n"; } } diff --git a/x2goserver/etc/x2goserver.conf b/x2goserver/etc/x2goserver.conf index 86f95b6..61312ee 100644 --- a/x2goserver/etc/x2goserver.conf +++ b/x2goserver/etc/x2goserver.conf @@ -5,5 +5,5 @@ #x2gousers=1 [log] -# possible levels are: emerg, alert, crit, err, warn, notice, info, debug +# possible levels are: emerg, alert, crit, err, warning, notice, info, debug loglevel=notice diff --git a/x2goserver/lib/x2gologlevel.pm b/x2goserver/lib/x2gologlevel.pm index 845287d..b6df771 100644 --- a/x2goserver/lib/x2gologlevel.pm +++ b/x2goserver/lib/x2gologlevel.pm @@ -40,11 +40,11 @@ sub x2gologlevel { elsif ( $strloglevel eq "alert" ) { $loglevel = LOG_ALERT; } elsif ( $strloglevel eq "crit" ) { $loglevel = LOG_CRIT; } elsif ( $strloglevel eq "err" ) { $loglevel = LOG_ERR; } - elsif ( $strloglevel eq "warn" ) { $loglevel = LOG_WARNING; } + elsif ( $strloglevel eq "warning" ) { $loglevel = LOG_WARNING; } elsif ( $strloglevel eq "notice" ) { $loglevel = LOG_NOTICE; } elsif ( $strloglevel eq "info" ) { $loglevel = LOG_INFO; } elsif ( $strloglevel eq "debug" ) { $loglevel = LOG_DEBUG; } return $loglevel; } -1; \ No newline at end of file +1; hooks/post-receive -- x2goserver.git (X2go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2go Server).

1 0

cups-x2go.git - master (branch) updated: 3.0.0.2-28-gdc94404
by git-admin＠x2go.org 10 Sep '11

10 Sep '11

The branch, master has been updated via dc9440484640c352fdfe2780692fef048569575d (commit) from 1bf0849263317a9baa1f9001db5dec3c1e93805f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit dc9440484640c352fdfe2780692fef048569575d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Sep 10 02:46:55 2011 +0200 loglevel warn has to be warning ----------------------------------------------------------------------- Summary of changes: cups-x2go | 4 ++-- cups-x2go.conf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/cups-x2go b/cups-x2go index 9943926..2275525 100755 --- a/cups-x2go +++ b/cups-x2go @@ -41,7 +41,7 @@ my $printdsa = "/root/.ssh/id_dsa-x2goprint"; my $ps2pdf = "/usr/bin/gs -q -dCompatibilityLevel=1.4 -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile=\"%s.pdf\" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c .setpdfwrite -f \"%s\""; #my $ps2pdf = "/usr/bin/gs -q -dCompatibilityLevel=1.4 -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile=\"%s.pdf\" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c .setpdfwrite -f /usr/bin/margin-offset.ps \"%s\""; -## loglevel for cups-x2go, possible values: emerg, alert, crit, err, warn, notice, info, debug +## loglevel for cups-x2go, possible values: emerg, alert, crit, err, warning, notice, info, debug my $strloglevel = "notice"; # override hardcoded settings via config file @@ -96,7 +96,7 @@ sub setmylogmask { elsif ( $strloglevel eq "alert" ) { $loglevel = LOG_ALERT; } elsif ( $strloglevel eq "crit" ) { $loglevel = LOG_CRIT; } elsif ( $strloglevel eq "err" ) { $loglevel = LOG_ERR; } - elsif ( $strloglevel eq "warn" ) { $loglevel = LOG_WARNING; } + elsif ( $strloglevel eq "warning" ) { $loglevel = LOG_WARNING; } elsif ( $strloglevel eq "notice" ) { $loglevel = LOG_NOTICE; } elsif ( $strloglevel eq "info" ) { $loglevel = LOG_INFO; } elsif ( $strloglevel eq "debug" ) { $loglevel = LOG_DEBUG; } diff --git a/cups-x2go.conf b/cups-x2go.conf index 74d083d..e44f6dc 100644 --- a/cups-x2go.conf +++ b/cups-x2go.conf @@ -16,5 +16,5 @@ ## command to generate PDF file #ps2pdf = /usr/bin/gs -q -dCompatibilityLevel=1.4 -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile=\"%s.pdf\" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c .setpdfwrite -f \"%s\" -## loglevel for cups-x2go, possible values: emerg, alert, crit, err, warn, notice, info, debug +## loglevel for cups-x2go, possible values: emerg, alert, crit, err, warning, notice, info, debug #loglevel = notice hooks/post-receive -- cups-x2go.git (CUPS Backend for X2go Printing) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "cups-x2go.git" (CUPS Backend for X2go Printing).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-254-gf7db69b
by git-admin＠x2go.org 10 Sep '11

10 Sep '11

The branch, master has been updated via f7db69b952f84420aa24b8fb1f7c4b47ebaedf50 (commit) from 458dd0d2aac7966f8476d889eff136e4cf46d983 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f7db69b952f84420aa24b8fb1f7c4b47ebaedf50 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Sep 10 02:32:03 2011 +0200 not showing x2golistsessions calls in loglevel mode info ----------------------------------------------------------------------- Summary of changes: x2goserver/bin/x2golistsessions | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2goserver/bin/x2golistsessions b/x2goserver/bin/x2golistsessions index a30ce43..080aa94 100755 --- a/x2goserver/bin/x2golistsessions +++ b/x2goserver/bin/x2golistsessions @@ -34,7 +34,8 @@ setlogmask( LOG_UPTO(x2gologlevel()) ); if ( @ARGV ) { syslog('info', "x2golistsessions has been called with options: @ARGV"); } else { - syslog('info', "x2golistsessions has been called with no option"); + # hiding normal x2golistsessions calls into debug loglevel + syslog('debug', "x2golistsessions has been called with no option"); } sub check_stat @@ -90,4 +91,4 @@ for (my $i=0;$i<@outp;$i++) } # closing syslog -closelog; \ No newline at end of file +closelog; hooks/post-receive -- x2goserver.git (X2go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2go Server).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-253-g458dd0d
by git-admin＠x2go.org 10 Sep '11

10 Sep '11

The branch, master has been updated via 458dd0d2aac7966f8476d889eff136e4cf46d983 (commit) from 858bba095723b6b801ae975ac8f89651cc737ad9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 458dd0d2aac7966f8476d889eff136e4cf46d983 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Sep 10 02:21:38 2011 +0200 minor log message fix ----------------------------------------------------------------------- Summary of changes: x2goserver/bin/x2goumount-session | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session index c69cd2c..c85211b 100755 --- a/x2goserver/bin/x2goumount-session +++ b/x2goserver/bin/x2goumount-session @@ -89,7 +89,7 @@ for ($i=0;$i<@outp;$i++) if (@mounts[$j]=~m/sshfs/ && @mounts[$j]=~m/@line[0]/ && @mounts[$j]=~m/@line[1]/ ) { $found=1; - syslog('debug', "found mount point for @mounts[$j]"); + syslog('debug', "found mounted share @mounts[$j]"); $remote=(split(" ",@mounts[$j]))[0]; goto break; } @@ -99,7 +99,7 @@ break: { if (system( "fusermount -u @line[1]" ) == 0) { - syslog('notice', "successfully mounted @line[1]"); + syslog('notice', "successfully unmounted @line[1]"); $found=0; } else hooks/post-receive -- x2goserver.git (X2go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2go Server).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-252-g858bba0
by git-admin＠x2go.org 10 Sep '11

10 Sep '11

The branch, master has been updated via 858bba095723b6b801ae975ac8f89651cc737ad9 (commit) via bb802fa01525d261d92e6bed6bf56a7a11e4fea9 (commit) via 165bdd743f9c5b5a37878fb5e0ecf5ca74542f58 (commit) from 8404361f7900534b81206aaefcef04c57d9e5910 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 858bba095723b6b801ae975ac8f89651cc737ad9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Sep 10 02:10:20 2011 +0200 add log messages to x2goumount-session commit bb802fa01525d261d92e6bed6bf56a7a11e4fea9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Sep 10 02:10:06 2011 +0200 add log messages to x2goruncommand commit 165bdd743f9c5b5a37878fb5e0ecf5ca74542f58 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Sep 10 02:09:45 2011 +0200 log message fix for x2gostartagent ----------------------------------------------------------------------- Summary of changes: x2goserver/bin/x2goruncommand | 3 +++ x2goserver/bin/x2gostartagent | 4 ++-- x2goserver/bin/x2goumount-session | 8 +++++++- 3 files changed, 12 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 6b038d9..7e8db47 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -110,14 +110,17 @@ then fi if [ "$EXEC" != "" ] && [ -x $EXEC ]; then + $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "running command $EXEC" $cmd #### some applications can quit immediately, we will wait here as long as x2goagent exists if [ "$X2GO_SESS_TYPE" == "R" ] && [ "$IMEXIT" == "false" ]; then + $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "command $EXEC forked to background, waiting for agent to finish" while [ -d /proc/$X2GO_AGENT_PID ]; do sleep 1 done fi else + $X2GO_LIB_PATH/x2gosyslog "$0" "err" "ERROR: command $EXEC failed to execute" echo "X2GORUNCOMMAND ERR NOEXEC:$cmd" > $MESSAGE_FILE fi diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index fac17f6..699688b 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -227,8 +227,8 @@ fi X2GO_AGENT_PID=$! X2GO_AGENT_RETVAL=$? test $X2GO_AGENT_RETVAL && \ - $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "successfully started X2go session with ID $SESSION_NAME" || \ - $X2GO_LIB_PATH/x2gosyslog "$0" "err" "ERROR: failed to start X2go session with ID $SESSION_NAME" + $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "successfully started X2go agent session with ID $SESSION_NAME" || \ + $X2GO_LIB_PATH/x2gosyslog "$0" "err" "ERROR: failed to start X2go agent session with ID $SESSION_NAME" X2GO_SND_PORT=1024 diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session index f63ee36..c69cd2c 100755 --- a/x2goserver/bin/x2goumount-session +++ b/x2goserver/bin/x2goumount-session @@ -89,6 +89,7 @@ for ($i=0;$i<@outp;$i++) if (@mounts[$j]=~m/sshfs/ && @mounts[$j]=~m/@line[0]/ && @mounts[$j]=~m/@line[1]/ ) { $found=1; + syslog('debug', "found mount point for @mounts[$j]"); $remote=(split(" ",@mounts[$j]))[0]; goto break; } @@ -98,11 +99,13 @@ break: { if (system( "fusermount -u @line[1]" ) == 0) { + syslog('notice', "successfully mounted @line[1]"); $found=0; } else { $ENV{'DISPLAY'}=":$display"; + syslog('err', "ERROR: failed to unmount @line[1]"); if ($use_zenity == 0) { system("kdialog --error \"@line[1]\"&"); @@ -120,15 +123,18 @@ break: $remote="$ENV{'HOME'}/Desktop/$remote"; if ( -e "$remote(sshfs-disk)") { - unlink("$remote(sshfs-disk)"); + syslog('info', "removing desktop icon $remote(sshfs-disk)"); + unlink("$remote(sshfs-disk)"); } $remote=~s/%2framdrive%2fmnt%2f//; if ( -e "$remote(sshfs-removable)") { + syslog('info', "removing desktop icon $remote(sshfs-removable)"); unlink("$remote(sshfs-removable)"); } if ( -e "$remote(sshfs-cdrom)") { + syslog('info', "removing desktop icon $remote(sshfs-cdrom)"); unlink("$remote(sshfs-cdrom)"); } db_deletemount ($session, @line[1]); hooks/post-receive -- x2goserver.git (X2go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2go Server).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-249-g8404361
by git-admin＠x2go.org 09 Sep '11

09 Sep '11

The branch, master has been updated via 8404361f7900534b81206aaefcef04c57d9e5910 (commit) from 7ebf1019b340513c7f666bd7d19329ad4cc5ce82 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 8404361f7900534b81206aaefcef04c57d9e5910 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Sep 10 01:29:21 2011 +0200 log message fix for x2gostartagent ----------------------------------------------------------------------- Summary of changes: x2goserver/bin/x2gostartagent | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 3527ac4..fac17f6 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -20,8 +20,6 @@ # Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> -set -e - X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" @@ -226,9 +224,11 @@ else LD_LIBRARY_PATH=$X2GO_LIB x2goagent $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE -auth ~/.Xauthority -geometry ${X2GO_GEOMETRY} -name "X2GO-${SESSION_NAME}" ${NX_AGENT} 2>${SESSION_DIR}/session.log & fi -$X2GO_LIB_PATH/x2gosyslog "$0" "notice" "successfully started X2go session with ID $SESSION_NAME" - X2GO_AGENT_PID=$! +X2GO_AGENT_RETVAL=$? +test $X2GO_AGENT_RETVAL && \ + $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "successfully started X2go session with ID $SESSION_NAME" || \ + $X2GO_LIB_PATH/x2gosyslog "$0" "err" "ERROR: failed to start X2go session with ID $SESSION_NAME" X2GO_SND_PORT=1024 hooks/post-receive -- x2goserver.git (X2go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2go Server).

1 0

python-x2go.git - master (branch) updated: 0.1.1.4-27-g8a9eb20
by git-admin＠x2go.org 09 Sep '11

09 Sep '11

The branch, master has been updated via 8a9eb2072d948116d1ce9d668be2656c15861be8 (commit) from 0389489a4e5d4479ddfa48979d41749bef80245a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 8a9eb2072d948116d1ce9d668be2656c15861be8 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Sep 10 01:21:02 2011 +0200 Catching fautly x2gostartagent behaviour. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/backends/info/_stdout.py | 48 +++++++++++++++++++++++------------- x2go/backends/terminal/_stdout.py | 13 +++++++--- 3 files changed, 41 insertions(+), 21 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 6bb444a..6f9b1b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,7 @@ python-x2go (0.1.1.5-0~x2go1) unstable; urgency=low Kniep for digging this out). - Make X2goTerminalSessionSTDOUT.has_command resistable against empty command strings. + - Catching fautly x2gostartagent behaviour. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 19 Jul 2011 20:44:30 +0200 diff --git a/x2go/backends/info/_stdout.py b/x2go/backends/info/_stdout.py index 3eef7ce..529a8f3 100644 --- a/x2go/backends/info/_stdout.py +++ b/x2go/backends/info/_stdout.py @@ -87,23 +87,37 @@ class X2goServerSessionInfoSTDOUT(object): Parse x2gostartagent output. """ - l = x2go_output.split("\n") - self.name = l[3] - self.cookie = l[1] - self.agent_pid = int(l[2]) - self.display = int(l[0]) - self.graphics_port = int(l[4]) - self.snd_port = int(l[5]) - self.sshfs_port = int(l[6]) - self.username = '' - self.hostname = '' - # TODO: we have to see how we fill these fields here... - self.date_created = '' - self.date_suspended = '' - # TODO: presume session is running after x2gostartagent, this could be better - self.status = 'R' - self.local_container = '' - self.remote_container = '' + try: + l = x2go_output.split("\n") + self.name = l[3] + self.cookie = l[1] + self.agent_pid = int(l[2]) + self.display = int(l[0]) + self.graphics_port = int(l[4]) + self.snd_port = int(l[5]) + self.sshfs_port = int(l[6]) + self.username = '' + self.hostname = '' + # TODO: we have to see how we fill these fields here... + self.date_created = '' + self.date_suspended = '' + # TODO: presume session is running after x2gostartagent, this could be better + self.status = 'R' + self.local_container = '' + self.remote_container = '' + except IndexError, e: + # DEBUGGING CODE + print 'Encountered IndexError: %s' % str(e) + print 'THIS SHOULD NOT HAPPEN... HERE IS THE x2golistsessions OUTPUT THAT CAUSED THE ERROR...' + print x2go_output + raise e + except ValueError, e: + # DEBUGGING CODE + print 'Encountered IndexError: %s' % str(e) + print 'THIS SHOULD NOT HAPPEN... HERE IS THE x2golistsessions OUTPUT THAT CAUSED THE ERROR...' + print x2go_output + raise e + def initialize(self, x2go_output, username='', hostname='', local_container='', remote_container=''): """\ diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index 04b58a3..8f00822 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -869,10 +869,15 @@ class X2goTerminalSessionSTDOUT(object): if "ACCESS DENIED" in _stderr and "XSHAD" in _stderr: raise x2go_exceptions.X2goDesktopSharingException('X2go desktop sharing has been denied by the remote user') - self.session_info.initialize(_stdout, - username=self.control_session.remote_username(), - hostname=self.control_session.get_transport().getpeername(), - ) + try: + self.session_info.initialize(_stdout, + username=self.control_session.remote_username(), + hostname=self.control_session.get_transport().getpeername(), + ) + except ValueError: + raise X2goTerminalSessionException("failed to start X2go session") + except IndexError: + raise X2goTerminalSessionException("failed to start X2go session") # local path may be a Windows path, so we use the path separator of the local system self.session_info.local_container = os.path.join(self.params.rootdir, 'S-%s' % self.session_info.name) hooks/post-receive -- python-x2go.git (Python X2go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2go Client API).

1 0

python-x2go.git - release/0.1.1.x (branch) updated: 0.1.1.4-25-gdf3fab7
by git-admin＠x2go.org 09 Sep '11

09 Sep '11

The branch, release/0.1.1.x has been updated via df3fab737e8dd0d1cf6a42afc296fed407468284 (commit) from 73cf843144b4363d265b946567e7a4484e335558 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit df3fab737e8dd0d1cf6a42afc296fed407468284 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Sep 10 01:21:02 2011 +0200 Catching fautly x2gostartagent behaviour. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/backends/info/_stdout.py | 48 +++++++++++++++++++++++------------- x2go/backends/terminal/_stdout.py | 13 +++++++--- 3 files changed, 41 insertions(+), 21 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index e8f0286..11455cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ python-x2go (0.1.1.5-0~x2go1) UNRELEASED; urgency=low Kniep for digging this out). - Make X2goTerminalSessionSTDOUT.has_command resistable against empty command strings. + - Catching fautly x2gostartagent behaviour. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 19 Jul 2011 20:44:30 +0200 diff --git a/x2go/backends/info/_stdout.py b/x2go/backends/info/_stdout.py index b59880e..5cae736 100644 --- a/x2go/backends/info/_stdout.py +++ b/x2go/backends/info/_stdout.py @@ -87,23 +87,37 @@ class X2goServerSessionInfoSTDOUT(object): Parse x2gostartagent output. """ - l = x2go_output.split("\n") - self.name = l[3] - self.cookie = l[1] - self.agent_pid = int(l[2]) - self.display = int(l[0]) - self.graphics_port = int(l[4]) - self.snd_port = int(l[5]) - self.sshfs_port = int(l[6]) - self.username = '' - self.hostname = '' - # TODO: we have to see how we fill these fields here... - self.date_created = '' - self.date_suspended = '' - # TODO: presume session is running after x2gostartagent, this could be better - self.status = 'R' - self.local_container = '' - self.remote_container = '' + try: + l = x2go_output.split("\n") + self.name = l[3] + self.cookie = l[1] + self.agent_pid = int(l[2]) + self.display = int(l[0]) + self.graphics_port = int(l[4]) + self.snd_port = int(l[5]) + self.sshfs_port = int(l[6]) + self.username = '' + self.hostname = '' + # TODO: we have to see how we fill these fields here... + self.date_created = '' + self.date_suspended = '' + # TODO: presume session is running after x2gostartagent, this could be better + self.status = 'R' + self.local_container = '' + self.remote_container = '' + except IndexError, e: + # DEBUGGING CODE + print 'Encountered IndexError: %s' % str(e) + print 'THIS SHOULD NOT HAPPEN... HERE IS THE x2golistsessions OUTPUT THAT CAUSED THE ERROR...' + print x2go_output + raise e + except ValueError, e: + # DEBUGGING CODE + print 'Encountered IndexError: %s' % str(e) + print 'THIS SHOULD NOT HAPPEN... HERE IS THE x2golistsessions OUTPUT THAT CAUSED THE ERROR...' + print x2go_output + raise e + def initialize(self, x2go_output, username='', hostname='', local_container='', remote_container=''): """\ diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index 331119b..92dac9f 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -869,10 +869,15 @@ class X2goTerminalSessionSTDOUT(object): if "ACCESS DENIED" in _stderr and "XSHAD" in _stderr: raise x2go_exceptions.X2goDesktopSharingException('X2go desktop sharing has been denied by the remote user') - self.session_info.initialize(_stdout, - username=self.control_session.remote_username(), - hostname=self.control_session.get_transport().getpeername(), - ) + try: + self.session_info.initialize(_stdout, + username=self.control_session.remote_username(), + hostname=self.control_session.get_transport().getpeername(), + ) + except ValueError: + raise X2goTerminalSessionException("failed to start X2go session") + except IndexError: + raise X2goTerminalSessionException("failed to start X2go session") # local path may be a Windows path, so we use the path separator of the local system self.session_info.local_container = os.path.join(self.params.rootdir, 'S-%s' % self.session_info.name) hooks/post-receive -- python-x2go.git (Python X2go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2go Client API).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits