Merge it back in, so it runs in 1 time

This commit is contained in:
Jake Howard 2017-10-08 17:42:04 +01:00
parent fd8be599cf
commit 64ca88daa0
Signed by: jake
GPG key ID: 57AFB45680EDD477
3 changed files with 5 additions and 3 deletions

View file

@ -2,8 +2,8 @@
set -e set -e
patch /usr/bin/makepkg < makepkg.patch
puppet apply manifests/main.pp --modulepath=modules/ --verbose puppet apply manifests/main.pp --modulepath=modules/ --verbose
patch /usr/bin/makepkg < makepkg.patch
puppet apply manifests/packages.pp --modulepath=modules/ --verbose
patch /usr/bin/makepkg -R < makepkg.patch patch /usr/bin/makepkg -R < makepkg.patch

View file

@ -1,5 +1,7 @@
class yaourt { class yaourt {
include 'yaourt::files' include 'yaourt::files'
include 'yaourt::packages';
include 'yaourt::keys' include 'yaourt::keys'
} }

View file

@ -1,4 +1,4 @@
node default { class yaourt::packages () {
package {[ package {[
'acpi', 'acpi',
'advanced-ssh-config', 'advanced-ssh-config',