diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2018-11-27 21:40:31 +0100 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-01-06 12:19:27 +0100 |
| commit | b2854e9edc8da3d945b4e53f80afc4c9f7129fd4 (patch) | |
| tree | e80d9c2faf72ebef1367835145cbc420a610d8d4 | |
| parent | 111e596200ac613f9e50a05d60410604fdd0ca61 (diff) | |
| download | meson-b2854e9edc8da3d945b4e53f80afc4c9f7129fd4.zip meson-b2854e9edc8da3d945b4e53f80afc4c9f7129fd4.tar.gz meson-b2854e9edc8da3d945b4e53f80afc4c9f7129fd4.tar.bz2 | |
Fixed rebase error
| -rw-r--r-- | mesonbuild/mintro.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/mintro.py b/mesonbuild/mintro.py index 5ab1d1f..4f0e928 100644 --- a/mesonbuild/mintro.py +++ b/mesonbuild/mintro.py @@ -469,12 +469,12 @@ def find_buildsystem_files_list(src_dir): for f in files: if f == 'meson.build' or f == 'meson_options.txt': filelist.append(os.path.relpath(os.path.join(root, f), src_dir)) - return ('buildsystem_files', filelist) + return filelist def list_buildsystem_files(builddata): src_dir = builddata.environment.get_source_dir() filelist = find_buildsystem_files_list(src_dir) - return filelist + return ('buildsystem_files', filelist) def list_deps(coredata): result = [] |