summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2008-10-14 08:47:21 +1100
committerJames Turnbull <james@lovedthanlost.net>2008-10-14 08:47:21 +1100
commitf5fb2d383ee9836bddd031b714907cddacd28046 (patch)
tree60b5011f716619e2fe07697619354458f8dd5e2d
parentb0fd2e057a7fbff59565febc3ebb60a33863ff85 (diff)
downloadpuppet-f5fb2d383ee9836bddd031b714907cddacd28046.tar.gz
puppet-f5fb2d383ee9836bddd031b714907cddacd28046.tar.xz
puppet-f5fb2d383ee9836bddd031b714907cddacd28046.zip
Fixed #1649 - OS X package creation script should be more selective about cleaning out prior versions
-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"