Gitweb links:
...log
http://git.netsurf-browser.org/toolchains.git/shortlog/517219aa415eccb7002b036e4ca24323b8a92b73
...commit
http://git.netsurf-browser.org/toolchains.git/commit/517219aa415eccb7002b036e4ca24323b8a92b73
...tree
http://git.netsurf-browser.org/toolchains.git/tree/517219aa415eccb7002b036e4ca24323b8a92b73
The branch, master has been updated
via 517219aa415eccb7002b036e4ca24323b8a92b73 (commit)
from 370c81960e82cb6284d12c164e445f2eb0424a32 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=517219aa415eccb7002b036e4ca24323b8a92b73
commit 517219aa415eccb7002b036e4ca24323b8a92b73
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>
tools/import-orig: support git < 2.46.0
diff --git a/tools/import-orig b/tools/import-orig
index cf5224012a..9bb72b2b2c 100755
--- a/tools/import-orig
+++ b/tools/import-orig
@@ -16,6 +16,19 @@ class ImportTool:
self._package_version = args.package_version
self._package_name = args.package_name
self._package_ext = None
+ self._git_version = None
+
+ def _determine_git_version(self):
+ output = subprocess.check_output(["/usr/bin/git", "--version"])
+ parts = output.split()
+ if len(parts) != 3:
+ print("ERROR: unexpected 'git --version' format", file=sys.stderr)
+ return
+ if parts[0] != "git" or parts[1] != "version":
+ print("ERROR: unexpected 'git --version' format", file=sys.stderr)
+ return
+ major, minor, patch = parts[2].split(".")
+ self._git_version = (int(major), int(minor), int(patch))
def _detect_package_details(self):
# Compute filetype
@@ -76,8 +89,12 @@ class ImportTool:
cwd=worktree,
)
return None
+
+ show_ref_flag = "--branches"
+ if self._git_version < (2, 46, 0):
+ show_ref_flag = "--heads"
output = subprocess.check_output(
- ["/usr/bin/git", "show-ref", "--branches", branch_name],
+ ["/usr/bin/git", "show-ref", show_ref_flag, branch_name],
cwd=worktree,
)
return output.splitlines()[0].split(None, 1)[0]
@@ -206,6 +223,7 @@ class ImportTool:
print("ERROR: non-existent source", file=sys.stderr)
return
+ self._determine_git_version()
self._detect_package_details()
print(
-----------------------------------------------------------------------
Summary of changes:
tools/import-orig | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/tools/import-orig b/tools/import-orig
index cf5224012a..9bb72b2b2c 100755
--- a/tools/import-orig
+++ b/tools/import-orig
@@ -16,6 +16,19 @@ class ImportTool:
self._package_version = args.package_version
self._package_name = args.package_name
self._package_ext = None
+ self._git_version = None
+
+ def _determine_git_version(self):
+ output = subprocess.check_output(["/usr/bin/git", "--version"])
+ parts = output.split()
+ if len(parts) != 3:
+ print("ERROR: unexpected 'git --version' format", file=sys.stderr)
+ return
+ if parts[0] != "git" or parts[1] != "version":
+ print("ERROR: unexpected 'git --version' format", file=sys.stderr)
+ return
+ major, minor, patch = parts[2].split(".")
+ self._git_version = (int(major), int(minor), int(patch))
def _detect_package_details(self):
# Compute filetype
@@ -76,8 +89,12 @@ class ImportTool:
cwd=worktree,
)
return None
+
+ show_ref_flag = "--branches"
+ if self._git_version < (2, 46, 0):
+ show_ref_flag = "--heads"
output = subprocess.check_output(
- ["/usr/bin/git", "show-ref", "--branches", branch_name],
+ ["/usr/bin/git", "show-ref", show_ref_flag, branch_name],
cwd=worktree,
)
return output.splitlines()[0].split(None, 1)[0]
@@ -206,6 +223,7 @@ class ImportTool:
print("ERROR: non-existent source", file=sys.stderr)
return
+ self._determine_git_version()
self._detect_package_details()
print(
--
Cross-compilation toolchains and environments
