[Python-checkins] hooks: Fix buildbot hook for hg 1.9

Sat Jul 23 16:33:48 CEST 2011

http://hg.python.org/hooks/rev/9f892b325417
changeset: 76:9f892b325417
user: Antoine Pitrou <solipsis at pitrou.net>
date: Sat Jul 23 16:33:48 2011 +0200
summary:
 Fix buildbot hook for hg 1.9
files:
 hgbuildbot.py | 6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/hgbuildbot.py b/hgbuildbot.py
--- a/hgbuildbot.py
+++ b/hgbuildbot.py
@@ -41,7 +41,7 @@
 sys.path.append('/data/buildbot/lib/python')
 
 
-def sendchanges(master, changes):
+def sendchanges(ui, master, changes):
 # send change information to one master
 from buildbot.clients import sendchange
 
@@ -56,6 +56,8 @@
 # Yikes!
 if isinstance(v, localstr):
 change[k] = fromlocal(v).decode('utf8', 'replace')
+ elif isinstance(v, str):
+ change[k] = v.decode('utf8', 'replace')
 d.addCallback(send, change)
 d.addCallbacks(s.printSuccess, s.printFailure)
 d.addBoth(s.stop)
@@ -116,7 +118,7 @@
 new_stdout = sys.stdout = StringIO()
 try:
 for master in masters:
- sendchanges(master, changes)
+ sendchanges(ui, master, changes)
 reactor.run()
 finally:
 sys.stdout = old_stdout
-- 
Repository URL: http://hg.python.org/hooks
