Fix merge file using an array. Closes mesonbuild#4424.

samay-sharma · Oct 29, 2018 · fe3efe0 · fe3efe0
1 parent a52cd31
commit fe3efe0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/mesonbuild/modules/i18n.py b/mesonbuild/modules/i18n.py
@@ -85,6 +85,10 @@ def merge_file(self, state, args, kwargs):
         if hasattr(inputfile, 'held_object'):
             ct = build.CustomTarget(kwargs['output'] + '_merge', state.subdir, state.subproject, kwargs)
         else:
+            if isinstance(inputfile, list):
+                # We only use this input file to create a name of the custom target.
+                # Thus we can ignore the other entries.
+                inputfile = inputfile[0]
             if isinstance(inputfile, str):
                 inputfile = mesonlib.File.from_source_file(state.environment.source_dir,
                                                            state.subdir, inputfile)

diff --git a/test cases/frameworks/6 gettext/data/meson.build b/test cases/frameworks/6 gettext/data/meson.build
@@ -10,7 +10,7 @@ i18n.merge_file(
 
 # Use filename substitution for another file
 i18n.merge_file(
-  input: 'test2.desktop.in',
+  input: files('test2.desktop.in'),
   output: '@BASENAME@',
   type: 'desktop',
   po_dir: '../po',