summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2007-12-11 11:42:40 -0500
committerMichael DeHaan <mdehaan@redhat.com>2007-12-11 11:42:40 -0500
commite3a830e91f2eab284181864d3fdc2a31ccfdd0f8 (patch)
treeb1104240503d243535abcbb9f205864df14c77eb
parent18e53b6d4a55c511393cde5fa7d28d2855c3a1f3 (diff)
downloadthird_party-func-e3a830e91f2eab284181864d3fdc2a31ccfdd0f8.tar.gz
third_party-func-e3a830e91f2eab284181864d3fdc2a31ccfdd0f8.tar.xz
third_party-func-e3a830e91f2eab284181864d3fdc2a31ccfdd0f8.zip
Fix the noglob handling, fixing things like func-inventory after the Multiplexer
patches were applied.
-rwxr-xr-xfunc/overlord/client.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/func/overlord/client.py b/func/overlord/client.py
index a52aefa..47ab50c 100755
--- a/func/overlord/client.py
+++ b/func/overlord/client.py
@@ -135,8 +135,7 @@ class Client(object):
self.noglobs = noglobs
self.nforks = nforks
- self.servers = expand_servers(self.server_spec,port=self.port,
- noglobs=self.noglobs,verbose=self.verbose)
+ self.servers = expand_servers(self.server_spec, port=self.port, noglobs=self.noglobs,verbose=self.verbose)
# default cert/ca/key is the same as the certmaster ca - need to
# be able to change that on the cli
@@ -226,8 +225,10 @@ class Client(object):
(nkey,nvalue) = process_server(0, 0, x)
results[nkey] = nvalue
else:
- # no need to go through the fork code, we can do this directly
- self.process_server(0, 0, self.server)
+ # globbing is not being used, but still need to make sure
+ # URI is well formed.
+ expanded = expand_servers(self.server_spec, port=self.port, noglobs=True, verbose=self.verbose)[0]
+ process_server(0, 0, expanded)
return results