From 10baf124499653217b9f990ceb17b7a29eba6417 Mon Sep 17 00:00:00 2001 From: Silcet Date: Mon, 26 Apr 2021 08:17:01 +0000 Subject: [PATCH] Fixed indentations in patch --- ...fix-dynamic-update-of-python-shebang.patch | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/meta-networking/recipes-connectivity/ufw/ufw/fix-dynamic-update-of-python-shebang.patch b/meta-networking/recipes-connectivity/ufw/ufw/fix-dynamic-update-of-python-shebang.patch index 53bc908e25f..0bb0315ccdf 100644 --- a/meta-networking/recipes-connectivity/ufw/ufw/fix-dynamic-update-of-python-shebang.patch +++ b/meta-networking/recipes-connectivity/ufw/ufw/fix-dynamic-update-of-python-shebang.patch @@ -1,6 +1,6 @@ -From bc9310accc3da641de8d81614fa1509276eba532 Mon Sep 17 00:00:00 2001 +From b961a7fceb5654c283c3f987bee593d52abaf1f5 Mon Sep 17 00:00:00 2001 From: Silcet -Date: Fri, 23 Apr 2021 13:44:47 +0000 +Date: Mon, 26 Apr 2021 07:47:02 +0000 Subject: [PATCH] ufw: Fix dynamic update of python shebang [meta-openembedded ticket #327] -- https://github.com/openembedded/meta-openembedded/issues/327 @@ -19,14 +19,14 @@ Upstream-status: Pending Signed-off-by: Silcet --- - setup.py | 17 ++++------------- - 1 file changed, 4 insertions(+), 13 deletions(-) + setup.py | 21 ++++++--------------- + 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/setup.py b/setup.py -index ca730b7..e799414 100644 +index ca730b7..941bbf6 100644 --- a/setup.py +++ b/setup.py -@@ -112,21 +112,12 @@ class Install(_install, object): +@@ -112,22 +112,13 @@ class Install(_install, object): for f in [ script, manpage, manpage_f ]: self.mkpath(os.path.dirname(f)) @@ -42,13 +42,16 @@ index ca730b7..e799414 100644 - - if re.search("(/usr/bin/env)", sys.executable): - print("found 'env' in sys.executable (%s)" % (sys.executable)) -+ python_major = sys.version_info.major -+ print("Updating staging/ufw to use (python%s)" % (python_major)) - subprocess.call(["sed", +- subprocess.call(["sed", - "-i.jjm", - "1s%^#.*python.*%#! " + sys.executable + "%g", -+ "-i", -+ "1s%^#.*python.*%&" + str(python_major) + "%", - 'staging/ufw']) +- 'staging/ufw']) ++ python_major = sys.version_info.major ++ print("Updating staging/ufw to use (python%s)" % (python_major)) ++ subprocess.call(["sed", ++ "-i.jjm", ++ "1s%^#.*python.*%#! " + sys.executable + "%g", ++ 'staging/ufw']) self.copy_file('staging/ufw', script) + self.copy_file('doc/ufw.8', manpage)