diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-02-24 22:50:23 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-02-24 22:50:23 +0000 |
| commit | 503ad38194b0064de240a1ae0f043b8fb6d40903 (patch) | |
| tree | 4ba9efa72dc535b5a827d4ad29ec9f580ac557d7 | |
| parent | 043fc33c32e817092f1c44f6d9b9e9c3d35cadac (diff) | |
| download | puppet-503ad38194b0064de240a1ae0f043b8fb6d40903.tar.gz puppet-503ad38194b0064de240a1ae0f043b8fb6d40903.tar.xz puppet-503ad38194b0064de240a1ae0f043b8fb6d40903.zip | |
Fixing bug #72, where trailing slashes break file sourcing
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@944 980ebf18-57e1-0310-9a29-db15c13687c0
| -rwxr-xr-x | lib/puppet/server/fileserver.rb | 3 | ||||
| -rwxr-xr-x | lib/puppet/type/pfile/source.rb | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/lib/puppet/server/fileserver.rb b/lib/puppet/server/fileserver.rb index cd8511ad6..067f1da0f 100755 --- a/lib/puppet/server/fileserver.rb +++ b/lib/puppet/server/fileserver.rb @@ -420,6 +420,9 @@ class Server if path == "" path = nil + else + # Remove any double slashes that might have occurred + path.gsub!(/\/\//, "/") end return mount, path end diff --git a/lib/puppet/type/pfile/source.rb b/lib/puppet/type/pfile/source.rb index d2561a658..b33bdb38f 100755 --- a/lib/puppet/type/pfile/source.rb +++ b/lib/puppet/type/pfile/source.rb @@ -157,6 +157,8 @@ module Puppet # here doesn't really matter, because the @should values will be # overridden when we 'retrieve'. munge do |source| + # Remove any trailing slashes + source.sub!(/\/$/, '') unless @parent.uri2obj(source) raise Puppet::Error, "Invalid source %s" % source end |