-
Notifications
You must be signed in to change notification settings - Fork 723
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
1 changed file
with
15 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
From bc9310accc3da641de8d81614fa1509276eba532 Mon Sep 17 00:00:00 2001 | ||
From b961a7fceb5654c283c3f987bee593d52abaf1f5 Mon Sep 17 00:00:00 2001 | ||
From: Silcet <[email protected]> | ||
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 <[email protected]> | ||
--- | ||
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) |