diff options
author | Jacob Helwig <jacob@puppetlabs.com> | 2011-08-02 11:13:21 -0700 |
---|---|---|
committer | Jacob Helwig <jacob@puppetlabs.com> | 2011-08-19 13:52:58 -0700 |
commit | 1e59b268063772a59efdc810e5967c63e05cdb2d (patch) | |
tree | 4a9147f45d2ecd06432f217f57cae717789762b4 /spec | |
parent | 37f87b709598b48bc8b562422da27cc73cc1eff1 (diff) | |
download | puppet-1e59b268063772a59efdc810e5967c63e05cdb2d.tar.gz puppet-1e59b268063772a59efdc810e5967c63e05cdb2d.tar.xz puppet-1e59b268063772a59efdc810e5967c63e05cdb2d.zip |
Always put a slash between the checksum and path in filebucket URLs
Since absolute paths on Windows do not always start with /, we need to
make sure that there is always a slash between the checksum and the
path, or the drive letter will end up being considered as part of the
checksum.
On systems where absolute paths always start with /, the extra slash
is removed by the parsing done to the constructed URL.
Reviewed-by: Nick Lewis <nick@puppetlabs.com>
(cherry picked from commit 5314376d4378c4b4f990a7d61a9677594e12a2a5)
Diffstat (limited to 'spec')
-rwxr-xr-x | spec/unit/file_bucket/dipper_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/unit/file_bucket/dipper_spec.rb b/spec/unit/file_bucket/dipper_spec.rb index 431b12371..605719324 100755 --- a/spec/unit/file_bucket/dipper_spec.rb +++ b/spec/unit/file_bucket/dipper_spec.rb @@ -91,7 +91,7 @@ describe Puppet::FileBucket::Dipper do [request1, request2].each do |r| r.server.should == 'puppetmaster' r.port.should == 31337 - r.key.should == "md5/#{checksum}#{real_path}" + r.key.should == "md5/#{checksum}/#{real_path}" end end |