[X2Go-Commits] python-x2go.git - twofactorauth (branch) updated: 0.0.36.1-17-g7531933

X2Go dev team git-admin at x2go.org
Sat Sep 14 15:56:09 CEST 2013


The branch, twofactorauth has been updated
       via  7531933268c319fcea4e6637bef74051769c1096 (commit)
      from  136a8e11cd579f1e338268936fe4fe98be17a4de (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 x2go/client.py       |    7 +++++--
 x2go/printactions.py |   21 ++++++++++++---------
 2 files changed, 17 insertions(+), 11 deletions(-)

The diff of changes is:
diff --git a/x2go/client.py b/x2go/client.py
index 889befe..bb92ae2 100644
--- a/x2go/client.py
+++ b/x2go/client.py
@@ -289,8 +289,11 @@ class X2goClient(object):
         self.logger('HOOK_no_such_command: the command %s is not available for X2go server (profile: %s, session: %s)' % (cmd, profile_name, session_name), loglevel=log.loglevel_WARN)
     def HOOK_open_dropbox_saveas_dialog(self, filename, profile_name='UNKNOWN', session_name='UNKNOWN'):
         self.logger('HOOK_open_dropbox_saveas_dialog: incoming dropbox job ,, %s'' detected by X2goClient hook method' % filename, loglevel=log.loglevel_WARN)
-    def HOOK_printaction_error(self, filename, profile_name='UNKNOWN', session_name='UNKNOWN', err_msg='GENERIC_ERROR'):
-        self.logger('HOOK_printaction_error: incoming print job ,, %s'' caused error: %s' % (filename, err_msg), loglevel=log.loglevel_ERROR)
+    def HOOK_printaction_error(self, filename, profile_name='UNKNOWN', session_name='UNKNOWN', err_msg='GENERIC_ERROR', printer=None):
+        if printer:
+            self.logger('HOOK_printaction_error: incoming print job ,, %s'' on printer %s caused error: %s' % (filename, printer, err_msg), loglevel=log.loglevel_ERROR)
+        else:
+            self.logger('HOOK_printaction_error: incoming print job ,, %s'' caused error: %s' % (filename, err_msg), loglevel=log.loglevel_ERROR)
     def HOOK_on_control_session_death(self, profile_name):
         self.logger('HOOK_on_control_session_death: the control session of profile %s has died unexpectedly' % profile_name, loglevel=log.loglevel_WARN)
     def HOOK_pulseaudio_not_supported_in_RDPsession(self):
diff --git a/x2go/printactions.py b/x2go/printactions.py
index e101658..3e44b0a 100644
--- a/x2go/printactions.py
+++ b/x2go/printactions.py
@@ -183,7 +183,7 @@ class X2goPrintActionPDFVIEW(X2goPrintAction):
                                                                 profile_name=self.profile_name,
                                                                 session_name=self.session_name,
                                                                 err_msg=str(win_err)
-                                                               )        
+                                                               )
                 else:
                     self.logger('Encountered WindowsError: %s' % str(win_err), loglevel=log.loglevel_ERROR)
             time.sleep(20)
@@ -297,14 +297,17 @@ class X2goPrintActionPRINT(X2goPrintAction):
                 _printer = win32print.GetDefaultPrinter()
             self.logger('printing incoming PDF file %s' % pdf_file, loglevel=log.loglevel_NOTICE)
             self.logger('printer name is %s' % _printer, loglevel=log.loglevel_DEBUG)
-            win32api.ShellExecute (
-                  0,
-                  "print",
-                  pdf_file,
-                  '/d:"%s"' % _printer,
-                  ".",
-                  0
-            )
+            try:
+                win32api.ShellExecute (
+                      0,
+                      "print",
+                      pdf_file,
+                      '/d:"%s"' % _printer,
+                      ".",
+                      0
+                )
+            except error, e:
+                self.HOOK_printaction_error(file_name=_hr_filename, printer=_printer, error=str(e), profile_name=self.profile_name, session_name=self.session_name)
         else:
             _hr_filename = self._humanreadable_filename(pdf_file, job_title, spool_dir)
             self.logger('printing incoming PDF file %s' % _hr_filename, loglevel=log.loglevel_NOTICE)


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




More information about the x2go-commits mailing list