Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGonzalo Odiard <godiard@gmail.com>2013-11-19 13:34:02 (GMT)
committer Gonzalo Odiard <godiard@gmail.com>2013-11-19 13:34:02 (GMT)
commit2dba244b36b6fae27a906265909c897ffebdd8c0 (patch)
tree4bd275e3badea491913db401806e49df512bf1ca
parent42880cd22128624dc07d3c8468307289508f9f32 (diff)
Use activity root to generate the collector file - SL #4407
Signed-off-by: Frederick Grose <fgrose@gmail.com> Reviewed-by: Gonzalo Odiard <gonzalo@laptop.org>
-rw-r--r--logviewer.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/logviewer.py b/logviewer.py
index 1f9bea0..3ab6354 100644
--- a/logviewer.py
+++ b/logviewer.py
@@ -637,9 +637,10 @@ class CollectorPalette(Palette):
def _on_send_button_clicked_cb(self, button):
identifier = str(int(time.time()))
filename = '%s.zip' % identifier
+ filepath = os.path.join(activity.get_activity_root(), filename)
success = True
try:
- filename = self._collector.write_logs(archive=filename, logbytes=0)
+ self._collector.write_logs(archive=filepath, logbytes=0)
except:
success = False
@@ -664,9 +665,9 @@ class CollectorPalette(Palette):
}
for k, v in metadata.items():
jobject.metadata[k] = v
- jobject.file_path = os.path.join(activity.get_bundle_path(), filename)
+ jobject.file_path = filepath
datastore.write(jobject)
self._last_log = jobject.object_id
jobject.destroy()
activity.show_object_in_journal(self._last_log)
- os.remove(filename)
+ os.remove(filepath)