#
#
# patch "mtn.py"
#  from [5e6345494b17afba6591be6869d5f4f0b15334a9]
#    to [a19b4c4d0b411d0856437d0ab46f48a0fe2f34df]
#
============================================================
--- mtn.py	5e6345494b17afba6591be6869d5f4f0b15334a9
+++ mtn.py	a19b4c4d0b411d0856437d0ab46f48a0fe2f34df
@@ -142,19 +142,16 @@ class Automate(Runner):
 
         return CleanRequest(self.__run(*args, **kwargs))
 
-    def __run(self, command, args, **kwargs):
+    def __run(self, command, args, opts = []):
         def str_with_len(l, s):
             l.append(str(len(s)))
             l.append(":")
             l.append(s)
         parts = []
-        for k in kwargs:
-            # can't use a '-' as a named function argument
-            kd = k.replace('_', '-')
-            parts.append("o")
-            str_with_len(parts, kd)
-            str_with_len(parts, kwargs[k])
-            parts.append("e")
+        parts.append("o")
+        for opt in opts:
+            str_with_len(parts, opt)
+        parts.append("e")
         parts.append("l")
         str_with_len(parts, command)
         for x in args:
@@ -410,7 +407,7 @@ class Operations(object):
             yield Revision(revision_id)
 
     def branches(self):
-        for line in (t.strip() for t in self.automate.run('branches', [], ignore_suspend_certs="")):
+        for line in (t.strip() for t in self.automate.run('branches', [], ['ignore-suspend-certs', ''])):
             if not line:
                 continue
             yield apply(Branch, (line,))