all tests now pass on solaris 10x86; i had to do some stupid hacking with base64 for it to work, and i am working getting a much better base class for all test classes

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@635 980ebf18-57e1-0310-9a29-db15c13687c0

5 files changed, 5 insertions, 5 deletions

diff --git a/bin/puppet b/bin/puppet
index d4ad1af8f..cf70a93de 100755
--- a/bin/puppet
+++ b/bin/puppet
@@ -50,7 +50,7 @@ $haveusage = true
 
 begin
     require 'rdoc/usage'
-rescue
+rescue LoadError
     $haveusage = false
 end
 
diff --git a/bin/puppetca b/bin/puppetca
index b28125a72..af04f12a2 100755
--- a/bin/puppetca
+++ b/bin/puppetca
@@ -73,7 +73,7 @@ $haveusage = true
 
 begin
     require 'rdoc/usage'
-rescue
+rescue LoadError
     $haveusage = false
 end
 
diff --git a/bin/puppetd b/bin/puppetd
index 0579002b2..90ffbe816 100755
--- a/bin/puppetd
+++ b/bin/puppetd
@@ -86,7 +86,7 @@ require 'getoptlong'
 $haveusage = true
 begin
     require 'rdoc/usage'
-rescue
+rescue LoadError
     $haveusage = false
 end
 
diff --git a/bin/puppetdoc b/bin/puppetdoc
index bc7146a2d..04af5b35e 100755
--- a/bin/puppetdoc
+++ b/bin/puppetdoc
@@ -41,7 +41,7 @@ $haveusage = true
 
 begin
     require 'rdoc/usage'
-rescue
+rescue LoadError
     $haveusage = false
 end
 
diff --git a/bin/puppetmasterd b/bin/puppetmasterd
index df59e6430..45bd07f1a 100755
--- a/bin/puppetmasterd
+++ b/bin/puppetmasterd
@@ -104,7 +104,7 @@ $haveusage = true
 
 begin
     require 'rdoc/usage'
-rescue
+rescue LoadError
     $haveusage = false
 end