diff options
author | Adrian Likins <alikins@redhat.com> | 2008-11-11 18:22:30 -0500 |
---|---|---|
committer | Adrian Likins <alikins@redhat.com> | 2008-11-11 18:22:30 -0500 |
commit | a41094a337ce90de8a6adc8d982de07d2f54e231 (patch) | |
tree | 1332d71ae823e809ea15f9a35921d705b52e6fea | |
parent | 89ca4a0734e36082f37efd20dcfb347972ca6c40 (diff) | |
download | func-a41094a337ce90de8a6adc8d982de07d2f54e231.tar.gz func-a41094a337ce90de8a6adc8d982de07d2f54e231.tar.xz func-a41094a337ce90de8a6adc8d982de07d2f54e231.zip |
For some reason, Client is getting init'ed with async=None
which is wrong. So workaround that.
The real problem seems to be somewhere in base_command,
but this will prevent it from defaulting to async for now.
-rwxr-xr-x | func/overlord/client.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/func/overlord/client.py b/func/overlord/client.py index b0ca7df..5d930fe 100755 --- a/func/overlord/client.py +++ b/func/overlord/client.py @@ -156,7 +156,7 @@ def is_minion(minion_string): # from a comment at http://codecomments.wordpress.com/2008/04/08/converting-a-string-to-a-boolean-value-in-python/ -# basically excepy a string or a bool for the async arg, since func-transmit can be a bit weird about it especially +# basically except a string or a bool for the async arg, since func-transmit can be a bit weird about it especially # if we are using an older version of yaml (and we are...) def smart_bool(s): if s is True or s is False: @@ -189,12 +189,15 @@ class Overlord(object): self.noglobs = noglobs self.nforks = nforks self.async = smart_bool(async) - #self.async = async + #FIXME: async should never ne none, yet it is -akl + if async is None: + self.async = False + self.delegate = delegate self.mapfile = mapfile - self.minions_class = Minions(self.server_spec, port=self.port, noglobs=self.noglobs,verbose=self.verbose) + self.minions_class = Minions(self.server_spec, port=self.port, noglobs=self.noglobs, verbose=self.verbose) self.minions = self.minions_class.get_urls() if len(self.minions) == 0: raise Func_Client_Exception, 'Can\'t find any minions matching \"%s\". ' % self.server_spec |