ma1 pushed to branch tor-browser-115.10.0esr-13.5-1 at The Tor Project / Applications / Tor Browser
Commits:
-
89a5a7fd
by hackademix at 2024-04-15T11:52:47+02:00
1 changed file:
Changes:
| ... | ... | @@ -57,10 +57,12 @@ def get_local_root(): |
| 57 | 57 | global local_root
|
| 58 | 58 | if local_root is None:
|
| 59 | 59 | try:
|
| 60 | + # Make sure we have a matching remote in this git repository. Should raise Exception if we don't.
|
|
| 61 | + get_upstream_name()
|
|
| 60 | 62 | git_root = git_get(["rev-parse", "--show-toplevel"])[0]
|
| 61 | - except subprocess.CalledProcessError:
|
|
| 63 | + except Exception:
|
|
| 62 | 64 | git_root = None
|
| 63 | - if git_root is None or os.path.basename(git_root) != "tor-browser":
|
|
| 65 | + if git_root is None:
|
|
| 64 | 66 | local_root = ""
|
| 65 | 67 | else:
|
| 66 | 68 | local_root = git_root
|