Merge lp:~sylvain-pineau/checkbox/fixes_required_for_cdts into lp:checkbox

[Sylvain Pineau]

Collection of small fixes/enhancements to get cdts to work with a 2016 checkbox

[Paul Larson (pwlars)]

+1, this is what you showed at the standup a bit ago right?

review: Approve

[Sylvain Pineau (sylvain-pineau)]

Indeed, the extra menu was running from this branch

=== modified file 'checkbox-ng/launchers/checkbox-cli'
--- checkbox-ng/launchers/checkbox-cli	2016-05-30 21:46:04 +0000
+++ checkbox-ng/launchers/checkbox-cli	2016-06-03 10:18:52 +0000
@@ -697,8 +697,10 @@
                 self.launcher.transports['{}_file'.format(exporter)] = {
                     'type': 'file',
                     'path': path}
-                self.launcher.exporters[exporter] = {
-                    'unit': '2013.com.canonical.plainbox::{}'.format(exporter)}
+                if exporter not in self.launcher.exporters:
+                    self.launcher.exporters[exporter] = {
+                        'unit': '2013.com.canonical.plainbox::{}'.format(
+                            exporter)}
                 self.launcher.reports['2_{}_file'.format(exporter)] = {
                     'transport': '{}_file'.format(exporter),
                     'exporter': '{}'.format(exporter),

=== modified file 'checkbox-touch/components/WebViewer.qml'
--- checkbox-touch/components/WebViewer.qml	2015-07-16 13:58:31 +0000
+++ checkbox-touch/components/WebViewer.qml	2016-06-03 10:18:52 +0000
@@ -35,10 +35,24 @@
 		id: wv
 		anchors.fill: parent
 		url: ""
+        contextualActions: ActionList {
+            Action {
+                text: i18n.tr("Open in a browser")
+                onTriggered: Qt.openUrlExternally(wv.url)
+            }
+            Action {
+                text: i18n.tr("Go back one page")
+                onTriggered: wv.goBack()
+            }
+            Action {
+                text: i18n.tr("Reload current page")
+                onTriggered: wv.reload()
+            }
+        }
 	}
 
 	onUriChanged: {
 		wv.url = uri;
 		wv.reload();
 	}
-}
\ No newline at end of file
+}

=== modified file 'checkbox-touch/py/checkbox_touch.py'
--- checkbox-touch/py/checkbox_touch.py	2016-05-30 22:07:02 +0000
+++ checkbox-touch/py/checkbox_touch.py	2016-06-03 10:18:52 +0000
@@ -631,8 +631,10 @@
                 self.launcher.transports['{}_file'.format(exporter)] = {
                     'type': 'file',
                     'path': path}
-                self.launcher.exporters[exporter] = {
-                    'unit': '2013.com.canonical.plainbox::{}'.format(exporter)}
+                if exporter not in self.launcher.exporters:
+                    self.launcher.exporters[exporter] = {
+                        'unit': '2013.com.canonical.plainbox::{}'.format(
+                            exporter)}
                 self.launcher.reports['2_{}_file'.format(exporter)] = {
                     'transport': '{}_file'.format(exporter),
                     'exporter': '{}'.format(exporter)

=== modified file 'plainbox/plainbox/impl/exporter/tar.py'
--- plainbox/plainbox/impl/exporter/tar.py	2016-05-18 08:38:44 +0000
+++ plainbox/plainbox/impl/exporter/tar.py	2016-06-03 10:18:52 +0000
@@ -95,7 +95,7 @@
                     continue
                 for stdstream in ('stdout', 'stderr'):
                     filename = recordname.replace('record.gz', stdstream)
-                    if os.path.getsize(filename):
+                    if os.path.exists(filename) and os.path.getsize(filename):
                         arcname = os.path.basename(filename)
                         if stdstream == 'stdout':
                             arcname = os.path.splitext(arcname)[0]