From b0ae59724ed36242459a91c0f9c5ce036c46de41 Mon Sep 17 00:00:00 2001 From: Dominik Fischer Date: Thu, 23 Apr 2015 16:41:46 +0200 Subject: makepkg-template: support multiple --template-dirs Especially when maintaining local templates in addition to the ones stored in /usr/share/makepkg-template, it can be useful to include templates stored in multiple different locations into one PKGBUILD. This patch makes this possible by allowing --template-dir to be specified multiple times. This also introduces a dedicated error message when a template cannot be found, in contrast to the already existing "Couldn't detect version for template '%s'". If a template of the same name is present in more than one of the given directories, the last one always takes precedence. Neither the default behaviour without the option given, nor the handling of a single template dir is changed. Signed-off-by: Dominik Fischer Signed-off-by: Florian Pritz Signed-off-by: Allan McRae --- .../makepkg-template-tests/missing-template-symlink/testcase-config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/scripts/makepkg-template-tests/missing-template-symlink/testcase-config') diff --git a/test/scripts/makepkg-template-tests/missing-template-symlink/testcase-config b/test/scripts/makepkg-template-tests/missing-template-symlink/testcase-config index c0eabe0d..8f4c8b88 100644 --- a/test/scripts/makepkg-template-tests/missing-template-symlink/testcase-config +++ b/test/scripts/makepkg-template-tests/missing-template-symlink/testcase-config @@ -1,8 +1,8 @@ arguments+=() -expected_exitcode=255 +expected_exitcode=2 IFS="" read -d '' expected_output <<'EOF' -Couldn't detect version for template 'perl-module' +Failed to find template file matching 'perl-module.template' EOF IFS="" read -d '' expected_result <<'EOF' -- cgit v1.2.3-70-g09d2