From f9cadb9478a01ee8b5b1d3cf5489c6fa8db47250 Mon Sep 17 00:00:00 2001 From: Zhongyue Luo Date: Thu, 8 Nov 2012 09:55:15 +0800 Subject: [PATCH] Clean up executable modules Disabled execution of modules loaded by execution files in bin Changed file bit mode of modules which are executable Change-Id: If8a3378c79bb5bfcde1b93066c6b2c0a3d1107ad --- quantum/agent/dhcp_agent.py | 4 ---- quantum/agent/l3_agent.py | 4 ---- quantum/debug/shell.py | 3 --- quantum/plugins/cisco/client/cli.py | 1 + quantum/plugins/cisco/run_tests.py | 0 quantum/plugins/cisco/services/service_insertion.py | 1 + 6 files changed, 2 insertions(+), 11 deletions(-) mode change 100644 => 100755 quantum/plugins/cisco/client/cli.py mode change 100644 => 100755 quantum/plugins/cisco/run_tests.py mode change 100644 => 100755 quantum/plugins/cisco/services/service_insertion.py diff --git a/quantum/agent/dhcp_agent.py b/quantum/agent/dhcp_agent.py index bcc3aa9d1..18f966004 100644 --- a/quantum/agent/dhcp_agent.py +++ b/quantum/agent/dhcp_agent.py @@ -544,7 +544,3 @@ def main(): mgr = DhcpAgent(cfg.CONF) mgr.run() - - -if __name__ == '__main__': - main() diff --git a/quantum/agent/l3_agent.py b/quantum/agent/l3_agent.py index 41313b119..32e80fb33 100644 --- a/quantum/agent/l3_agent.py +++ b/quantum/agent/l3_agent.py @@ -552,7 +552,3 @@ def main(): mgr = L3NATAgent(conf) mgr.daemon_loop() - - -if __name__ == '__main__': - main() diff --git a/quantum/debug/shell.py b/quantum/debug/shell.py index f2495d2e0..65c9dc85f 100644 --- a/quantum/debug/shell.py +++ b/quantum/debug/shell.py @@ -79,6 +79,3 @@ class QuantumDebugShell(QuantumShell): def main(argv=None): return QuantumDebugShell(QUANTUM_API_VERSION).run(argv or sys.argv[1:]) - -if __name__ == "__main__": - sys.exit(main()) diff --git a/quantum/plugins/cisco/client/cli.py b/quantum/plugins/cisco/client/cli.py old mode 100644 new mode 100755 index 7530ddb77..333bd0caf --- a/quantum/plugins/cisco/client/cli.py +++ b/quantum/plugins/cisco/client/cli.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python # vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Copyright 2011 Cisco Systems, Inc. All rights reserved. diff --git a/quantum/plugins/cisco/run_tests.py b/quantum/plugins/cisco/run_tests.py old mode 100644 new mode 100755 diff --git a/quantum/plugins/cisco/services/service_insertion.py b/quantum/plugins/cisco/services/service_insertion.py old mode 100644 new mode 100755 index afd6b6041..19af73abf --- a/quantum/plugins/cisco/services/service_insertion.py +++ b/quantum/plugins/cisco/services/service_insertion.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python # vim: tabstop=4 shiftwidth=4 softtabstop=4 # # Copyright 2011 Cisco Systems, Inc. All rights reserved. -- 2.45.2