summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Moiseev <o2g.org.ru@gmail.com>2021-04-05 07:00:34 +0000
committerAndrey Moiseev <o2g.org.ru@gmail.com>2021-04-06 02:51:07 -0700
commitd5b6cc88f9308bfd73d9f9f7a2ef586ee1d1c79d (patch)
tree15e906b80201c7f50def351fc17d830cb88822d1
parentd3c4043db3833ec758093d40fe255518059baf5b (diff)
gst-env: Windows: Fix looking for cmd_or_ps.ps1 in the wrong directory
At the point of get_windows_shell() execution, the current directory equals DEFAULT_BUILDDIR=./build. But cmd_or_ps.ps1 is in SCRIPTDIR=./ (repo root). Point subprocess.check_output() to the correct directory. Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-build/-/merge_requests/238>
-rwxr-xr-xgst-env.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/gst-env.py b/gst-env.py
index fcd7863..0fa40f5 100755
--- a/gst-env.py
+++ b/gst-env.py
@@ -433,7 +433,7 @@ def get_subprocess_env(options, gst_version):
def get_windows_shell():
command = ['powershell.exe' ,'-noprofile', '-executionpolicy', 'bypass', '-file', 'cmd_or_ps.ps1']
- result = subprocess.check_output(command)
+ result = subprocess.check_output(command, cwd=SCRIPTDIR)
return result.decode().strip()
if __name__ == "__main__":