aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Becker <marc.h.becker@gmx.de>2017-02-27 14:43:01 +0100
committerJussi Pakkanen <jpakkane@gmail.com>2017-02-27 13:04:20 -0500
commit92d18b925679f2c889bf248fa23d6611968203f4 (patch)
tree781052be53763e3c80330ca73203b36f36901b14
parenta61e41b1d283e093367f73a5df7aac4817e60537 (diff)
downloadmeson-92d18b925679f2c889bf248fa23d6611968203f4.zip
meson-92d18b925679f2c889bf248fa23d6611968203f4.tar.gz
meson-92d18b925679f2c889bf248fa23d6611968203f4.tar.bz2
Fix directory context for git wrap check
-rw-r--r--authors.txt1
-rw-r--r--mesonbuild/wrap/wrap.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/authors.txt b/authors.txt
index 85d58c3..80c4bbb 100644
--- a/authors.txt
+++ b/authors.txt
@@ -66,3 +66,4 @@ Dima Krasner
Fabio Porcedda
Rodrigo Lourenço
Sebastian Stang
+Marc Becker
diff --git a/mesonbuild/wrap/wrap.py b/mesonbuild/wrap/wrap.py
index 7acbc76..b1efc13 100644
--- a/mesonbuild/wrap/wrap.py
+++ b/mesonbuild/wrap/wrap.py
@@ -129,7 +129,7 @@ class Resolver:
is_there = os.path.isdir(checkoutdir)
if is_there:
try:
- subprocess.check_call(['git', 'rev-parse'])
+ subprocess.check_call(['git', 'rev-parse'], cwd=checkoutdir)
is_there = True
except subprocess.CalledProcessError:
raise RuntimeError('%s is not empty but is not a valid '