From f57ac1881a3e0022a4fcaa45d6ef31539278ce32 Mon Sep 17 00:00:00 2001 From: Fabien Boucher Date: Wed, 30 Oct 2019 11:26:47 +0100 Subject: [PATCH] Remove uneeded shebang and exec bit on some files Having python files with exec bit and shebang defined in /usr/lib/python-*/site-package/ is not fine in a RPM package. Instead of carrying a patch in nodepool RPM packaging better to fix this directly upstream. Change-Id: I5a01e21243f175d28c67376941149e357cdacd26 --- nodepool/builder.py | 1 - nodepool/cmd/__init__.py | 1 - nodepool/cmd/builder.py | 6 ------ nodepool/cmd/launcher.py | 5 ----- nodepool/cmd/nodepoolcmd.py | 7 ------- nodepool/config.py | 2 -- nodepool/exceptions.py | 2 -- nodepool/launcher.py | 2 -- nodepool/nodeutils.py | 2 -- nodepool/provider_manager.py | 2 -- nodepool/stats.py | 2 -- nodepool/status.py | 2 -- nodepool/zk.py | 2 -- 13 files changed, 36 deletions(-) mode change 100755 => 100644 nodepool/builder.py mode change 100755 => 100644 nodepool/cmd/launcher.py mode change 100755 => 100644 nodepool/cmd/nodepoolcmd.py mode change 100755 => 100644 nodepool/config.py mode change 100755 => 100644 nodepool/exceptions.py mode change 100755 => 100644 nodepool/launcher.py mode change 100755 => 100644 nodepool/nodeutils.py mode change 100755 => 100644 nodepool/provider_manager.py mode change 100755 => 100644 nodepool/stats.py mode change 100755 => 100644 nodepool/status.py mode change 100755 => 100644 nodepool/zk.py diff --git a/nodepool/builder.py b/nodepool/builder.py old mode 100755 new mode 100644 index 37a333a3a..02926b51a --- a/nodepool/builder.py +++ b/nodepool/builder.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # Copyright 2015 Hewlett-Packard Development Company, L.P. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nodepool/cmd/__init__.py b/nodepool/cmd/__init__.py index 2e37adfc0..528a324e6 100644 --- a/nodepool/cmd/__init__.py +++ b/nodepool/cmd/__init__.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # Copyright 2012 Hewlett-Packard Development Company, L.P. # Copyright 2013 OpenStack Foundation # diff --git a/nodepool/cmd/builder.py b/nodepool/cmd/builder.py index 10579921c..46f304a27 100644 --- a/nodepool/cmd/builder.py +++ b/nodepool/cmd/builder.py @@ -1,5 +1,3 @@ -#!/usr/bin/env python -# # Licensed under the Apache License, Version 2.0 (the "License"); you may # not use this file except in compliance with the License. You may obtain # a copy of the License at @@ -66,7 +64,3 @@ class NodePoolBuilderApp(nodepool.cmd.NodepoolDaemonApp): def main(): return NodePoolBuilderApp.main() - - -if __name__ == "__main__": - sys.exit(main()) diff --git a/nodepool/cmd/launcher.py b/nodepool/cmd/launcher.py old mode 100755 new mode 100644 index a812cf03d..23c2677f8 --- a/nodepool/cmd/launcher.py +++ b/nodepool/cmd/launcher.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # Copyright 2012 Hewlett-Packard Development Company, L.P. # Copyright 2013 OpenStack Foundation # @@ -80,7 +79,3 @@ class NodePoolLauncherApp(nodepool.cmd.NodepoolDaemonApp): def main(): return NodePoolLauncherApp.main() - - -if __name__ == "__main__": - sys.exit(main()) diff --git a/nodepool/cmd/nodepoolcmd.py b/nodepool/cmd/nodepoolcmd.py old mode 100755 new mode 100644 index fdfeab455..1bba30f82 --- a/nodepool/cmd/nodepoolcmd.py +++ b/nodepool/cmd/nodepoolcmd.py @@ -1,5 +1,3 @@ -#!/usr/bin/env python -# # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may @@ -15,7 +13,6 @@ # under the License. import logging.config -import sys from prettytable import PrettyTable @@ -384,7 +381,3 @@ class NodePoolCmd(NodepoolApp): def main(): return NodePoolCmd.main() - - -if __name__ == "__main__": - sys.exit(main()) diff --git a/nodepool/config.py b/nodepool/config.py old mode 100755 new mode 100644 index 0f1eeffef..2dfafd932 --- a/nodepool/config.py +++ b/nodepool/config.py @@ -1,5 +1,3 @@ -#!/usr/bin/env python - # Copyright (C) 2011-2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/nodepool/exceptions.py b/nodepool/exceptions.py old mode 100755 new mode 100644 index f811a4ee7..e556bd323 --- a/nodepool/exceptions.py +++ b/nodepool/exceptions.py @@ -1,5 +1,3 @@ -#!/usr/bin/env python -# # Licensed under the Apache License, Version 2.0 (the "License"); you may # not use this file except in compliance with the License. You may obtain # a copy of the License at diff --git a/nodepool/launcher.py b/nodepool/launcher.py old mode 100755 new mode 100644 index 8f52037ad..a8d84e3ce --- a/nodepool/launcher.py +++ b/nodepool/launcher.py @@ -1,5 +1,3 @@ -#!/usr/bin/env python - # Copyright (C) 2011-2014 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/nodepool/nodeutils.py b/nodepool/nodeutils.py old mode 100755 new mode 100644 index 482dde67e..b2c418093 --- a/nodepool/nodeutils.py +++ b/nodepool/nodeutils.py @@ -1,5 +1,3 @@ -#!/usr/bin/env python - # Copyright (C) 2011-2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/nodepool/provider_manager.py b/nodepool/provider_manager.py old mode 100755 new mode 100644 index 28ed1762b..72a7bece1 --- a/nodepool/provider_manager.py +++ b/nodepool/provider_manager.py @@ -1,5 +1,3 @@ -#!/usr/bin/env python - # Copyright (C) 2011-2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/nodepool/stats.py b/nodepool/stats.py old mode 100755 new mode 100644 index c2186331d..6331e097a --- a/nodepool/stats.py +++ b/nodepool/stats.py @@ -1,5 +1,3 @@ -#!/usr/bin/env python -# # Licensed under the Apache License, Version 2.0 (the "License"); you may # not use this file except in compliance with the License. You may obtain # a copy of the License at diff --git a/nodepool/status.py b/nodepool/status.py old mode 100755 new mode 100644 index 3ee7dddb0..1eb3ff3f4 --- a/nodepool/status.py +++ b/nodepool/status.py @@ -1,5 +1,3 @@ -#!/usr/bin/env python -# # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nodepool/zk.py b/nodepool/zk.py old mode 100755 new mode 100644 index 748e01523..97f8a968f --- a/nodepool/zk.py +++ b/nodepool/zk.py @@ -1,5 +1,3 @@ -#!/usr/bin/env python -# # Licensed under the Apache License, Version 2.0 (the "License"); you may # not use this file except in compliance with the License. You may obtain # a copy of the License at