diff options
| author | Thom May <thom@may.lt> | 2016-10-04 18:55:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-04 18:55:21 +0100 |
| commit | 4f9d0256942f06d577bdd1fb6107f175927830f6 (patch) | |
| tree | 0d24fcfe99d991396bc6dc5ea28a0958acc6407e | |
| parent | 20434c66f0434d555f45abc5545b3373b2be9d72 (diff) | |
| parent | c7a9d89d4cbc7a2b794bc25d13100915149dc02f (diff) | |
| download | chef-4f9d0256942f06d577bdd1fb6107f175927830f6.tar.gz | |
Merge pull request #5290 from bai/better-apt-key-cache
Normalize full key name to avoid resource update on identical key names
| -rw-r--r-- | lib/chef/provider/apt_repository.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/provider/apt_repository.rb b/lib/chef/provider/apt_repository.rb index 9e077c8cbb..9e91b12373 100644 --- a/lib/chef/provider/apt_repository.rb +++ b/lib/chef/provider/apt_repository.rb @@ -153,7 +153,7 @@ class Chef end def install_key_from_uri - key_name = new_resource.key.split(%r{\/}).last + key_name = new_resource.key.gsub(/[^0-9A-Za-z\-]/, "_") cached_keyfile = ::File.join(Chef::Config[:file_cache_path], key_name) type = if new_resource.key.start_with?("http") :remote_file |