summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@dangerouslyinc.com>2007-10-02 18:34:02 -0300
committerJames Bowes <jbowes@redhat.com>2007-10-02 19:58:36 -0400
commit3c13a4f30f247f4aa75c02c65e6bb6e575e30d01 (patch)
treebcc302627cce2eb7a7e174ba5e47093658fd6b3c
parentb5c6a99683be439e910864f5389d0f3f86fa13a8 (diff)
downloadfunc-3c13a4f30f247f4aa75c02c65e6bb6e575e30d01.tar.gz
func-3c13a4f30f247f4aa75c02c65e6bb6e575e30d01.tar.xz
func-3c13a4f30f247f4aa75c02c65e6bb6e575e30d01.zip
Exit program after listing minions.
-rwxr-xr-xoverlord/client.py17
1 files changed, 1 insertions, 16 deletions
diff --git a/overlord/client.py b/overlord/client.py
index 378df02..133aafa 100755
--- a/overlord/client.py
+++ b/overlord/client.py
@@ -284,7 +284,7 @@ class FuncCommandLine(command.Command):
if options.list_minions:
self.list_minions()
- # -----------------------------------------------
+ sys.exit(0) # stop execution
def list_minions(self):
print "Minions:"
@@ -293,18 +293,3 @@ class FuncCommandLine(command.Command):
for cert in certs:
host = cert.replace(self.config.certroot, "")[1:-5]
print " %s" % host
-
-# ===================================================================
-
-if __name__ == "__main__":
- # this is what /usr/bin/func will run
- myname, argv = sys.argv[0], sys.argv[1:]
- cli = FuncCommandLine()
- rc = cli.do()
- sys.exit(rc)
-# cli = FuncCommandLine(myname,argv)
-
-# rc = cli.run()
- sys.exit(rc)
-
-