diff options
| author | Kai Kang <kai.kang@windriver.com> | 2023-03-15 21:55:36 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-03-23 22:45:33 +0000 |
| commit | ad4105820e180b3b4143d427401b9a6c7a33dbac (patch) | |
| tree | 96f32561535e8fe1a15b2b5ecca225476a97da23 /meta/recipes-devtools/python | |
| parent | 6af5a447a16f34700e2c911992a19b0dae75de28 (diff) | |
| download | poky-ad4105820e180b3b4143d427401b9a6c7a33dbac.tar.gz | |
python3-git: fix indent error
It fails to import anything from git/remote.py:
File "/path_to/python3-git-native/3.1.27-r0/GitPython-3.1.27/git/remote.py", line 700
url = Git.polish_url(url)
^
IndentationError: unexpected indent
(From OE-Core rev: 48633d8920210e55e0b9ee3004f0502f9f0eec48)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python')
| -rw-r--r-- | meta/recipes-devtools/python/python3-git/0001-python3-git-CVE-2022-24439-fix-from-PR-1521.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-devtools/python/python3-git/0001-python3-git-CVE-2022-24439-fix-from-PR-1521.patch b/meta/recipes-devtools/python/python3-git/0001-python3-git-CVE-2022-24439-fix-from-PR-1521.patch index e3e66ec450..a017369f37 100644 --- a/meta/recipes-devtools/python/python3-git/0001-python3-git-CVE-2022-24439-fix-from-PR-1521.patch +++ b/meta/recipes-devtools/python/python3-git/0001-python3-git-CVE-2022-24439-fix-from-PR-1521.patch | |||
| @@ -291,7 +291,7 @@ index 59681bc..cea6b99 100644 | |||
| 291 | scmd = 'add' | 291 | scmd = 'add' |
| 292 | kwargs['insert_kwargs_after'] = scmd | 292 | kwargs['insert_kwargs_after'] = scmd |
| 293 | - repo.git.remote(scmd, name, Git.polish_url(url), **kwargs) | 293 | - repo.git.remote(scmd, name, Git.polish_url(url), **kwargs) |
| 294 | + url = Git.polish_url(url) | 294 | + url = Git.polish_url(url) |
| 295 | + if not allow_unsafe_protocols: | 295 | + if not allow_unsafe_protocols: |
| 296 | + Git.check_unsafe_protocols(url) | 296 | + Git.check_unsafe_protocols(url) |
| 297 | + repo.git.remote(scmd, "--", name, url, **kwargs) | 297 | + repo.git.remote(scmd, "--", name, url, **kwargs) |