Adding a bit more testing to the config stuff

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

1 files changed, 3 insertions, 2 deletions

diff --git a/lib/puppet/type/pfile/mode.rb b/lib/puppet/type/pfile/mode.rb
index 96e29aabb..e29e74235 100755
--- a/lib/puppet/type/pfile/mode.rb
+++ b/lib/puppet/type/pfile/mode.rb
@@ -39,7 +39,7 @@ module Puppet
             # octal, yet the number can only be specified as a string right now
             value = should
             if value.is_a?(String)
-                unless value =~ /^[0-9]+$/
+                unless value =~ /^\d+$/
                     raise Puppet::Error, "File modes can only be numbers, not %s" %
                         value.inspect
                 end
@@ -47,11 +47,12 @@ module Puppet
                 unless value =~ /^0/
                     value = "0" + value
                 end
+                old = value
                 begin
                     value = Integer(value)
                 rescue ArgumentError => detail
                     raise Puppet::DevError, "Could not convert %s to integer" %
-                        value.inspect
+                        old.inspect
                 end
             end