aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2018-06-05 20:58:43 +0530
committerNirbheek Chauhan <nirbheek.chauhan@gmail.com>2018-06-06 06:59:06 +0000
commit68001193d30909c6b00044360e6366630c8ff337 (patch)
tree6344c86c308becce2e4e49ba093ae8392f29b205 /mesonbuild
parentf31679deddf9d3a311e72c80c4442a9049467a03 (diff)
downloadmeson-68001193d30909c6b00044360e6366630c8ff337.zip
meson-68001193d30909c6b00044360e6366630c8ff337.tar.gz
meson-68001193d30909c6b00044360e6366630c8ff337.tar.bz2
meson introspect: Fix --installed argument
Traceback (most recent call last): File "meson.py", line 29, in <module> sys.exit(mesonmain.main()) File "mesonbuild/mesonmain.py", line 411, in main return run(sys.argv[1:], launcher) File "mesonbuild/mesonmain.py", line 320, in run return mintro.run(remaining_args) File "mesonbuild/mintro.py", line 234, in run list_installed(installdata) File "mesonbuild/mintro.py", line 72, in list_installed for path, installdir, aliases, unknown1, unknown2 in installdata.targets: ValueError: too many values to unpack (expected 5)
Diffstat (limited to 'mesonbuild')
-rw-r--r--mesonbuild/mintro.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/mintro.py b/mesonbuild/mintro.py
index 81c70ed..57d70e7 100644
--- a/mesonbuild/mintro.py
+++ b/mesonbuild/mintro.py
@@ -69,7 +69,7 @@ def determine_installed_path(target, installdata):
def list_installed(installdata):
res = {}
if installdata is not None:
- for path, installdir, aliases, unknown1, unknown2 in installdata.targets:
+ for path, installdir, aliases, *unknown in installdata.targets:
res[os.path.join(installdata.build_dir, path)] = os.path.join(installdata.prefix, installdir, os.path.basename(path))
for path, installpath, unused_prefix in installdata.data:
res[path] = os.path.join(installdata.prefix, installpath)