From f5fb2d383ee9836bddd031b714907cddacd28046 Mon Sep 17 00:00:00 2001
From: James Turnbull <james@lovedthanlost.net>
Date: Tue, 14 Oct 2008 08:47:21 +1100
Subject: Fixed #1649 - OS X package creation script should be more selective
 about cleaning out prior versions

---
 CHANGELOG          | 4 ++++
 conf/osx/preflight | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

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"
-- 
cgit