From b2854e9edc8da3d945b4e53f80afc4c9f7129fd4 Mon Sep 17 00:00:00 2001 From: Daniel Mensinger Date: Tue, 27 Nov 2018 21:40:31 +0100 Subject: [PATCH] Fixed rebase error --- mesonbuild/mintro.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mesonbuild/mintro.py b/mesonbuild/mintro.py index 5ab1d1fee..4f0e9288f 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 = []