From abc62560f78fa227d6ffd3263a095665609a15b5 Mon Sep 17 00:00:00 2001 From: Paul Berry Date: Wed, 12 Jan 2011 15:41:39 -0800 Subject: (#5838) Support paths as part of file bucket requests. In versions of Puppet 2.6.0-2.6.4, file bucket requests are of the form md5//. The path functionality has been removed, however we still need to support requests coming from older clients. Paired-with: Jesse Wolfe --- lib/puppet/indirector/file_bucket_file/file.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/puppet/indirector/file_bucket_file/file.rb b/lib/puppet/indirector/file_bucket_file/file.rb index 38e0be6e9..8bea2d767 100644 --- a/lib/puppet/indirector/file_bucket_file/file.rb +++ b/lib/puppet/indirector/file_bucket_file/file.rb @@ -73,7 +73,7 @@ module Puppet::FileBucketFile end def request_to_checksum( request ) - checksum_type, checksum = request.key.split(/\//, 2) + checksum_type, checksum, path = request.key.split(/\//, 3) # Note: we ignore path if present. raise "Unsupported checksum type #{checksum_type.inspect}" if checksum_type != 'md5' raise "Invalid checksum #{checksum.inspect}" if checksum !~ /^[0-9a-f]{32}$/ checksum -- cgit