[gnome-ostree] supybot: Hopefully fix it
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-ostree] supybot: Hopefully fix it
- Date: Fri, 6 Sep 2013 19:54:34 +0000 (UTC)
commit 4497a0b2baf8ea0e88c5b017201c17ef2aa27f30
Author: Colin Walters <walters verbum org>
Date: Fri Sep 6 15:54:08 2013 -0400
supybot: Hopefully fix it
We were referencing status_msg when it was unbound.
extras/supybot/GNOMEOSTree/plugin.py | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
---
diff --git a/extras/supybot/GNOMEOSTree/plugin.py b/extras/supybot/GNOMEOSTree/plugin.py
index bc5a400..cb400f5 100644
--- a/extras/supybot/GNOMEOSTree/plugin.py
+++ b/extras/supybot/GNOMEOSTree/plugin.py
@@ -89,28 +89,29 @@ class GNOMEOSTree(callbacks.Plugin):
if (not status and version_unchanged):
return None
+ status_path = os.path.join(current_task_path, 'status.txt')
+ if os.path.exists(status_path):
+ f = open(status_path)
+ status_msg = f.read().strip()
+ f.close()
+ else:
+ status_msg = ''
+
new_state = {'version': taskver,
'success': success}
self._last_task_state[taskname] = new_state
- return (last_state, last_version, success_changed)
+ return (last_state, last_version, success_changed, status_msg)
def _query_new_task(self, taskname, status=False, announce_success=False, announce_periodic=False):
querystate = self._update_task_state(taskname, status=status)
if querystate is None:
return
- (last_state, last_version, success_changed) = querystate
+ (last_state, last_version, success_changed, status_msg) = querystate
success = self._last_task_state['success']
success_str = success and 'successful' or 'failed'
millis = float(metadata['elapsedMillis'])
- msg += "gnostree:%s %s: %s in %.1f seconds. " % (taskname, taskver, success_str, millis / 1000.0)
-
- status_path = os.path.join(current_task_path, 'status.txt')
- if os.path.exists(status_path):
- f = open(status_path)
- status_msg = f.read().strip()
- f.close()
- msg += status_msg + ' '
-
+ msg = "gnostree:%s %s: %s in %.1f seconds. %s " \
+ % (taskname, taskver, success_str, millis / 1000.0, status_msg)
msg += "%s/tasks/%s/output.txt" % (self._workurl, meta['path'])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]