Merge pull request #39 from quixoten/fix_conflict

Avoid conflicts from build-essential
echocat · Oct 13, 2015 · f8e44b2 · f8e44b2
2 parents ad5d3c1 + c63b35a
commit f8e44b2
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -45,7 +45,8 @@
     # install necessary packages for build.
     case $::operatingsystem {
       'Debian', 'Ubuntu': {
-        ensure_packages('build-essential', {'before' => Anchor['redis::prepare_build']} )
+        ensure_packages('build-essential')
+        Package['build-essential'] -> Anchor['redis::prepare_build']
       }
       'Fedora', 'RedHat', 'CentOS', 'OEL', 'OracleLinux', 'Amazon', 'Scientific': {
         ensure_packages(['make', 'gcc', 'glibc-devel'], {'before' => Anchor['redis::prepare_build']})