From 7e232e4a72a68ddcfa21cc44c705d8b6cc0092a4 Mon Sep 17 00:00:00 2001 From: Adrian Likins Date: Tue, 12 Feb 2008 14:36:27 -0500 Subject: Refactor the minion/server list and group stuff. Still not ideal, but a touch more OO. Also update unittests/etc. Did some s/servers/minions/ renaming while I was at it as well. Need to go back and finish that up. --- func/overlord/func_command.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'func/overlord/func_command.py') diff --git a/func/overlord/func_command.py b/func/overlord/func_command.py index 4cec8a0..8bc6b7c 100644 --- a/func/overlord/func_command.py +++ b/func/overlord/func_command.py @@ -55,10 +55,10 @@ class FuncCommandLine(command.Command): if len(args) < 2: print "see the func manpage for usage" sys.exit(411) - server_string = args[0] + minion_string = args[0] # try to be clever about this for now - if client.isServer(server_string) or self._isGlob(server_string): - self.server_spec = server_string + if client.is_minion(minion_string) or self._isGlob(minion_string): + self.server_spec = minion_string args.pop(0) # if it doesn't look like server, assume it # is a sub command? that seems wrong, what about -- cgit