diff options
| author | Dominik Fischer <d.f.fischer@web.de> | 2015-04-23 16:41:46 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2015-05-12 06:00:54 +0200 |
| commit | b0ae59724ed36242459a91c0f9c5ce036c46de41 (patch) | |
| tree | d7dc9ed3bdf32e62d5fee5f5c014c2cd661f2184 /test/scripts/makepkg-template-tests/compose-multiple-template-dirs | |
| parent | d4e5de4bf6b14a51f6ab23c1d80f38c2380917d8 (diff) | |
| download | pacman-b0ae59724ed36242459a91c0f9c5ce036c46de41.tar.gz pacman-b0ae59724ed36242459a91c0f9c5ce036c46de41.tar.xz | |
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 <d.f.fischer@web.de>
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'test/scripts/makepkg-template-tests/compose-multiple-template-dirs')
4 files changed, 25 insertions, 0 deletions
diff --git a/test/scripts/makepkg-template-tests/compose-multiple-template-dirs/PKGBUILD b/test/scripts/makepkg-template-tests/compose-multiple-template-dirs/PKGBUILD new file mode 100644 index 00000000..f8e09f8a --- /dev/null +++ b/test/scripts/makepkg-template-tests/compose-multiple-template-dirs/PKGBUILD @@ -0,0 +1,5 @@ +pkgname=foo +pkgver=1 + +# template input; name=build; version=1; +# template input; name=package; version=1; diff --git a/test/scripts/makepkg-template-tests/compose-multiple-template-dirs/templates/build/build-1.template b/test/scripts/makepkg-template-tests/compose-multiple-template-dirs/templates/build/build-1.template new file mode 100644 index 00000000..81f2745c --- /dev/null +++ b/test/scripts/makepkg-template-tests/compose-multiple-template-dirs/templates/build/build-1.template @@ -0,0 +1 @@ +build() {} diff --git a/test/scripts/makepkg-template-tests/compose-multiple-template-dirs/templates/package/package-1.template b/test/scripts/makepkg-template-tests/compose-multiple-template-dirs/templates/package/package-1.template new file mode 100644 index 00000000..056096fd --- /dev/null +++ b/test/scripts/makepkg-template-tests/compose-multiple-template-dirs/templates/package/package-1.template @@ -0,0 +1 @@ +package() {} diff --git a/test/scripts/makepkg-template-tests/compose-multiple-template-dirs/testcase-config b/test/scripts/makepkg-template-tests/compose-multiple-template-dirs/testcase-config new file mode 100644 index 00000000..3c58a617 --- /dev/null +++ b/test/scripts/makepkg-template-tests/compose-multiple-template-dirs/testcase-config @@ -0,0 +1,18 @@ +arguments+=(--template-dir $testdir/$testcase/templates/build) +arguments+=(--template-dir $testdir/$testcase/templates/package) +expected_exitcode=0 + +IFS="" read -d '' expected_output <<'EOF' +EOF + +IFS="" read -d '' expected_result <<'EOF' +pkgname=foo +pkgver=1 + +# template start; name=build; version=1; +build() {} +# template end; +# template start; name=package; version=1; +package() {} +# template end; +EOF |