1 files changed, 2 insertions, 6 deletions
diff --git a/lib/puppet/type/file/source.rb b/lib/puppet/type/file/source.rb
index 74cd4c028..9d1766c52 100755
--- a/lib/puppet/type/file/source.rb
+++ b/lib/puppet/type/file/source.rb
@@ -72,9 +72,7 @@ module Puppet
                     self.fail "Could not understand source #{source}: #{detail}"
                 end
 
-                unless uri.scheme.nil? or %w{file puppet}.include?(uri.scheme)
-                    self.fail "Cannot use URLs of type '#{uri.scheme}' as source for fileserving"
-                end
+                self.fail "Cannot use URLs of type '#{uri.scheme}' as source for fileserving" unless uri.scheme.nil? or %w{file puppet}.include?(uri.scheme)
             end
         end
 
@@ -171,9 +169,7 @@ module Puppet
         end
 
         def full_path
-            if found? and uri
-                return URI.unescape(uri.path)
-            end
+            return URI.unescape(uri.path) if found? and uri
         end
 
         def server