mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2025-10-04 02:09:44 +02:00
Merge remote-tracking branch 'origin/patch'
This commit is contained in:
commit
d58f2ad24c
1 changed files with 5 additions and 1 deletions
|
@ -431,7 +431,11 @@ class PyGhidraLauncher:
|
||||||
|
|
||||||
# Remove CWD from sys.path so we don't try to import from unintentional directories
|
# Remove CWD from sys.path so we don't try to import from unintentional directories
|
||||||
# (i.e, an unrelated "ghidra" directory the user may have created)
|
# (i.e, an unrelated "ghidra" directory the user may have created)
|
||||||
sys.path.remove(os.getcwd())
|
try:
|
||||||
|
sys.path.remove(os.getcwd())
|
||||||
|
except ValueError:
|
||||||
|
# CWD wasn't present on sys.path
|
||||||
|
pass
|
||||||
|
|
||||||
# Install hooks into python importlib
|
# Install hooks into python importlib
|
||||||
sys.meta_path.append(_PyGhidraImportLoader())
|
sys.meta_path.append(_PyGhidraImportLoader())
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue