[X2go-Commits] cups-x2go.git - master (branch) updated: 3.0.0.3-2-gea845a5

X2go dev team git-admin at x2go.org
Sat Dec 17 02:52:49 CET 2011


The branch, master has been updated
       via  ea845a5c5a6c5ff3dfabfe7a77e4a0d120d8f57a (commit)
      from  57cfdc83af8b5fd2a7e330c6c1af2fe93767190c (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 ea845a5c5a6c5ff3dfabfe7a77e4a0d120d8f57a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Dec 17 02:51:29 2011 +0100

    Add more debug messages.

-----------------------------------------------------------------------

Summary of changes:
 cups-x2go        |   13 ++++++++++---
 debian/changelog |    2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/cups-x2go b/cups-x2go
index 2275525..bc451f2 100755
--- a/cups-x2go
+++ b/cups-x2go
@@ -70,6 +70,7 @@ sub readconfig
 				{
 					$x2goserver=$value;
 					$x2goserver=~s/ //g;
+					$x2goserver=~s/\"//g;
 				}
 				if($option eq "printdsa")
 				{
@@ -108,15 +109,19 @@ sub getsessions
 	my $sesslist;
 	if ( $x2goserver eq "local" )
 	{
+		syslog("debug", "Querying local X2Go server for a session list...");
+
 		# run x2golistsessions locally
 		$sesslist=`su $userName -c "x2golistsessions --all-servers"`;
 	}
 	else
 	{
-		# Calling x2goprint with a single parameter <username> will result in an x2golistsessions --all-servers command on the
-		# remote X2go server.
+		syslog("debug", "Querying remote X2Go server $x2goserver for a session list...");
+		# Calling x2goprint with a single parameter <username> will result in an
+		# x2golistsessions --all-servers command on the remote X2go server.
 		$sesslist=`ssh -i $printdsa x2goprint\@$x2goserver "sudo x2goprint $userName"`;
 	}
+	syslog("debug", $sesslist);
 	@sessions=split("\n",$sesslist);
 }
 
@@ -136,7 +141,7 @@ sub printfile
 		# log that we are about to process a print job
 		syslog('debug', "x2goprint $userName $sess ${sess}_$bname ${sess}_$bname.title");
 
-                # process print job
+		# process print job
 		system( "x2goprint $userName $sess ${sess}_$bname ${sess}_$bname.title" );
 	}
 	else
@@ -221,6 +226,8 @@ print TITLE $jobTitle;
 close (TITLE);
 
 getsessions();
+syslog('debug', "Retrieved session list: @sessions\n");
+
 for(my $i=0; $i<scalar(@sessions);$i++ )
 {
 	my @sinfo=split("\\|", at sessions[$i]);
diff --git a/debian/changelog b/debian/changelog
index 5d15f80..3671c81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 cups-x2go (3.0.0.4-0~x2go1) UNRELEASED; urgency=low
 
   * New upstream version (3.0.0.4):
-    - Continue development...
+    - Add more debug messages.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Thu, 13 Oct 2011 02:07:16 +0200
 


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).




More information about the x2go-commits mailing list