diff options
Diffstat (limited to 'recipes-extended/cloud-init/cloud-init/0001-setup.py-check-for-install-anywhere-in-args.patch')
-rw-r--r-- | recipes-extended/cloud-init/cloud-init/0001-setup.py-check-for-install-anywhere-in-args.patch | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/recipes-extended/cloud-init/cloud-init/0001-setup.py-check-for-install-anywhere-in-args.patch b/recipes-extended/cloud-init/cloud-init/0001-setup.py-check-for-install-anywhere-in-args.patch index f61b82ce..e5b214fe 100644 --- a/recipes-extended/cloud-init/cloud-init/0001-setup.py-check-for-install-anywhere-in-args.patch +++ b/recipes-extended/cloud-init/cloud-init/0001-setup.py-check-for-install-anywhere-in-args.patch @@ -11,24 +11,23 @@ So rather than checking for install to be argv[1], we check for it anywhere in the arguments are trigger the template replacement to happen. +Upstream-Status: Inappropriate [embedded specific] + Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/setup.py b/setup.py -index cbacf48e..5f13d9eb 100755 ---- a/setup.py -+++ b/setup.py -@@ -87,7 +87,7 @@ def render_tmpl(template, mode=None): +Index: git/setup.py +=================================================================== +--- git.orig/setup.py ++++ git/setup.py +@@ -60,7 +60,7 @@ + that files are different outside of the debian directory.""" - # older versions of tox use bdist (xenial), and then install from there. # newer versions just use install. -- if not (sys.argv[1] == 'install' or sys.argv[1].startswith('bdist*')): +- if "install" not in sys.argv: + if not ('install' in sys.argv or sys.argv[1].startswith('bdist*')): return template tmpl_ext = ".tmpl" --- -2.25.1 - |