Merge pull request #124 from TomasKorbar/rhbz1577082

Fix troubleshoot

Author: zdohnal

authconn.py

@@ -233,6 +233,10 @@ def _make_binding (self, fname, fn):
 
     def _authloop (self, fname, fn, *args, **kwds):
         self._passes = 0
+        # remove signature if dbus is not being used and signature is provided
+        if not self._using_polkit():
+            kwds.pop('signature', None)
+
         c = self._connection
         retry = False
         while True:

cupspk.py

@@ -99,6 +99,8 @@ def _get_cups_pk(self):
 
     def _call_with_pk_and_fallback(self, use_fallback, pk_function_name, pk_args, fallback_function, *args, **kwds):
         pk_function = None
+        # take signature from kwds if is provided
+        dbus_args_signature = kwds.pop('signature', None)
 
         if not use_fallback:
             cups_pk = self._get_cups_pk()
@@ -116,7 +118,7 @@ def _call_with_pk_and_fallback(self, use_fallback, pk_function_name, pk_args, fa
         while True:
             try:
                 # FIXME: async call or not?
-                pk_retval = pk_function(*pk_args)
+                pk_retval = pk_function(*pk_args, signature = dbus_args_signature)
 
                 # if the PK call has more than one return values, we pop the
                 # first one as the error message

troubleshoot/DeviceListed.py

@@ -86,6 +86,7 @@ def display (self):
             self.authconn = answers['_authenticated_connection']
             try:
                 self.op = TimedOperation (self.authconn.getDevices,
+                                          kwargs={'signature': 'iiasas'},
                                           parent=parent)
                 devices = self.op.run ()
                 devices_list = []

troubleshoot/ErrorLogCheckpoint.py

@@ -134,28 +134,28 @@ def collect_answer (self):
         if 'error_log_checkpoint' in self.answers:
             return self.answers
 
-        with NamedTemporaryFile () as tmpf:
-            try:
-                self.op = TimedOperation (self.authconn.getFile,
-                                          args=('/admin/log/error_log',
-                                                tmpf.file),
-                                          parent=parent)
-                self.op.run ()
-            except (RuntimeError, cups.IPPError) as e:
-                self.answers['error_log_checkpoint_exc'] = e
-            except cups.HTTPError as e:
-                self.answers['error_log_checkpoint_exc'] = e
-
-                # Abandon the CUPS connection and make another.
-                answers = self.troubleshooter.answers
-                factory = answers['_authenticated_connection_factory']
-                self.authconn = factory.get_connection ()
-                self.answers['_authenticated_connection'] = self.authconn
+        tmpf = NamedTemporaryFile()
+        try:
+            self.op = TimedOperation (self.authconn.getFile,
+                                        args=["/admin/log/error_log"],
+                                        kwargs={'file': tmpf},
+                                        parent=parent)
+            self.op.run ()
+        except (RuntimeError, cups.IPPError) as e:
+            self.answers['error_log_checkpoint_exc'] = e
+        except cups.HTTPError as e:
+            self.answers['error_log_checkpoint_exc'] = e
+
+            # Abandon the CUPS connection and make another.
+            answers = self.troubleshooter.answers
+            factory = answers['_authenticated_connection_factory']
+            self.authconn = factory.get_connection ()
+            self.answers['_authenticated_connection'] = self.authconn
 
-            try:
-                statbuf = os.stat (tmpf.file)
-            except OSError:
-                statbuf = [0, 0, 0, 0, 0, 0, 0]
+        try:
+            statbuf = os.stat (tmpf.name)
+        except OSError:
+            statbuf = [0, 0, 0, 0, 0, 0, 0]
 
         self.answers['error_log_checkpoint'] = statbuf[6]
         self.persistent_answers['error_log_checkpoint'] = statbuf[6]

troubleshoot/ErrorLogFetch.py

@@ -69,11 +69,11 @@ def fetch_log (c):
             with NamedTemporaryFile (delete=False) as tmpf:
                 success = False
                 try:
-                    c.getFile ('/admin/log/error_log', tmpf.file)
+                    c.getFile ('/admin/log/error_log', file = tmpf)
                     success = True
                 except cups.HTTPError:
                     try:
-                        os.remove (tmpf.file)
+                        os.remove (tmpf.name)
                     except OSError:
                         pass
 

troubleshoot/__init__.py

@@ -23,6 +23,8 @@
 from gi.repository import Gtk
 import pprint
 import sys
+import datetime
+import time
 import traceback
 
 if __name__ == "__main__":
@@ -102,7 +104,9 @@ def __init__ (self, quitfn=None, parent=None):
 
         self.questions = []
         self.question_answers = []
-        self.answers = {}
+        # timestamp should be accessible through whole troubleshoot
+        now = datetime.datetime.fromtimestamp (time.time ())
+        self.answers = {'error_log_timestamp': now.strftime ("%F %T")}
         self.moving_backwards = False
 
         main.show_all ()