summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG4
-rwxr-xr-xconf/osx/preflight3
2 files changed, 6 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index d76604f6d..4699dd133 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,8 @@
0.24.6
+ Fixed #1649 - Updated OSX package cleanup
+
+ Fixed #1647 - puppetdoc -r providers now working again
+
Fixed #1639 - uninitialized constant Puppet::Type::User::ProviderUseradd
Fixed #1637 - With an inexistant (global) templatedir, modules
diff --git a/conf/osx/preflight b/conf/osx/preflight
index 57ebcb67e..cde682b9c 100755
--- a/conf/osx/preflight
+++ b/conf/osx/preflight
@@ -8,4 +8,5 @@
# ${3} is the destination volume so that this works correctly
# when being installed to volumes other than the current OS.
-rm -Rf "${3}{SITELIBDIR}/puppet*"
+/bin/rm -Rf "${3}{SITELIBDIR}/puppet"
+/bin/rm -Rf "${3}{SITELIBDIR}/puppet.rb"