diff options
author | Scott Henson <shenson@redhat.com> | 2008-01-13 15:08:14 -0500 |
---|---|---|
committer | Scott Henson <shenson@redhat.com> | 2008-01-13 15:08:14 -0500 |
commit | 962dbb643fdef4c6c071aeba6b29d372c965980d (patch) | |
tree | 0eb25f03d2c546f82b2183fc1b942d969d65d29e /func/overlord | |
parent | 0784290e45f61f11636771b5537d79cc17f2bd1b (diff) | |
parent | b90f49d4a9cea6b02fb739f8e3afe92dc7fd1731 (diff) | |
download | third_party-func-962dbb643fdef4c6c071aeba6b29d372c965980d.tar.gz third_party-func-962dbb643fdef4c6c071aeba6b29d372c965980d.tar.xz third_party-func-962dbb643fdef4c6c071aeba6b29d372c965980d.zip |
Merge branch 'master' of ssh://git.fedorahosted.org/git/func
Diffstat (limited to 'func/overlord')
-rwxr-xr-x | func/overlord/client.py | 10 | ||||
-rw-r--r-- | func/overlord/cmd_modules/call.py | 2 | ||||
-rw-r--r-- | func/overlord/cmd_modules/copyfile.py | 3 | ||||
-rw-r--r-- | func/overlord/cmd_modules/listminions.py | 2 |
4 files changed, 3 insertions, 14 deletions
diff --git a/func/overlord/client.py b/func/overlord/client.py index 6bebaf8..d8f7bb3 100755 --- a/func/overlord/client.py +++ b/func/overlord/client.py @@ -1,5 +1,3 @@ -#!/usr/bin/python - ## ## func command line interface & client lib ## @@ -62,10 +60,8 @@ class CommandAutomagic(object): method = ".".join(self.base[1:]) return self.clientref.run(module,method,args,nforks=self.nforks) -# =================================== - - +# =================================== # this is a module level def so we can use it and isServer() from # other modules with a Client class def expand_servers(spec, port=51234, noglobs=None, verbose=None, just_fqdns=False): @@ -104,6 +100,7 @@ def expand_servers(spec, port=51234, noglobs=None, verbose=None, just_fqdns=Fals return all_urls + # does the hostnamegoo actually expand to anything? def isServer(server_string): servers = expand_servers(server_string) @@ -111,6 +108,7 @@ def isServer(server_string): return True return False + class Client(object): def __init__(self, server_spec, port=DEFAULT_PORT, interactive=False, @@ -263,5 +261,3 @@ class Client(object): if x > max: max = x return max - - diff --git a/func/overlord/cmd_modules/call.py b/func/overlord/cmd_modules/call.py index b62131f..4828981 100644 --- a/func/overlord/cmd_modules/call.py +++ b/func/overlord/cmd_modules/call.py @@ -1,5 +1,3 @@ -#!/usr/bin/python - """ call func method invoker diff --git a/func/overlord/cmd_modules/copyfile.py b/func/overlord/cmd_modules/copyfile.py index ff1f148..7950b7b 100644 --- a/func/overlord/cmd_modules/copyfile.py +++ b/func/overlord/cmd_modules/copyfile.py @@ -1,5 +1,3 @@ -#!/usr/bin/python - """ copyfile command line @@ -73,4 +71,3 @@ class CopyFile(client.command.Command): data = xmlrpclib.Binary(fb) results = client_obj.run("copyfile", "copyfile", [self.options.remotepath, data, mode, uid, gid]) - diff --git a/func/overlord/cmd_modules/listminions.py b/func/overlord/cmd_modules/listminions.py index 95f0bc9..b34efe4 100644 --- a/func/overlord/cmd_modules/listminions.py +++ b/func/overlord/cmd_modules/listminions.py @@ -1,5 +1,3 @@ -#!/usr/bin/python - """ copyfile command line |