Skip to content

Commit d90426e

Browse files
authored
Merge pull request ansible#5829 from Fale/fix_main_cloud_amazon
Call main in conditional way - cloud/amazon
2 parents d9040e9 + b0d98da commit d90426e

File tree

14 files changed

+28
-14
lines changed

14 files changed

+28
-14
lines changed

cloud/amazon/ec2.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1624,4 +1624,5 @@ def main():
16241624
from ansible.module_utils.basic import *
16251625
from ansible.module_utils.ec2 import *
16261626

1627-
main()
1627+
if __name__ == '__main__':
1628+
main()

cloud/amazon/ec2_facts.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,4 +183,5 @@ def main():
183183
from ansible.module_utils.basic import *
184184
from ansible.module_utils.urls import *
185185

186-
main()
186+
if __name__ == '__main__':
187+
main()

cloud/amazon/ec2_group.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,4 +475,5 @@ def main():
475475
from ansible.module_utils.basic import *
476476
from ansible.module_utils.ec2 import *
477477

478-
main()
478+
if __name__ == '__main__':
479+
main()

cloud/amazon/ec2_key.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,4 +241,5 @@ def main():
241241
from ansible.module_utils.basic import *
242242
from ansible.module_utils.ec2 import *
243243

244-
main()
244+
if __name__ == '__main__':
245+
main()

cloud/amazon/ec2_lc.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,4 +308,5 @@ def main():
308308
elif state == 'absent':
309309
delete_launch_config(connection, module)
310310

311-
main()
311+
if __name__ == '__main__':
312+
main()

cloud/amazon/ec2_vpc.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -742,4 +742,5 @@ def main():
742742
from ansible.module_utils.basic import *
743743
from ansible.module_utils.ec2 import *
744744

745-
main()
745+
if __name__ == '__main__':
746+
main()

cloud/amazon/elasticache.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -554,4 +554,5 @@ def main():
554554
from ansible.module_utils.basic import *
555555
from ansible.module_utils.ec2 import *
556556

557-
main()
557+
if __name__ == '__main__':
558+
main()

cloud/amazon/elasticache_subnet_group.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,4 +151,5 @@ def main():
151151
from ansible.module_utils.basic import *
152152
from ansible.module_utils.ec2 import *
153153

154-
main()
154+
if __name__ == '__main__':
155+
main()

cloud/amazon/iam.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -795,4 +795,5 @@ def main():
795795
from ansible.module_utils.basic import *
796796
from ansible.module_utils.ec2 import *
797797

798-
main()
798+
if __name__ == '__main__':
799+
main()

cloud/amazon/iam_policy.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,4 +349,5 @@ def main():
349349
from ansible.module_utils.basic import *
350350
from ansible.module_utils.ec2 import *
351351

352-
main()
352+
if __name__ == '__main__':
353+
main()

0 commit comments

Comments
 (0)