diff options
| author | Thom May <thom@may.lt> | 2018-01-03 10:04:03 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-03 10:04:03 +0000 |
| commit | 1ae46b7fe459d9716c8518095bb27912d6de5d33 (patch) | |
| tree | 8fe9f7941721413d5ba867da12916e4a85214edf | |
| parent | 33b97469bf0d1ab93392d8bd83cfb50f1a46eb4f (diff) | |
| parent | 94d416d19e7758556f864c626b193d9765a223b8 (diff) | |
| download | chef-1ae46b7fe459d9716c8518095bb27912d6de5d33.tar.gz | |
Merge pull request #6711 from chef/simplify_provides
Don't check both platform_family / os in provides when platform_family will do
| -rw-r--r-- | lib/chef/provider/apt_preference.rb | 2 | ||||
| -rw-r--r-- | lib/chef/provider/apt_repository.rb | 2 | ||||
| -rw-r--r-- | lib/chef/provider/apt_update.rb | 2 | ||||
| -rw-r--r-- | lib/chef/provider/package/smartos.rb | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/lib/chef/provider/apt_preference.rb b/lib/chef/provider/apt_preference.rb index ff4ea02ff0..59c6fc7f6d 100644 --- a/lib/chef/provider/apt_preference.rb +++ b/lib/chef/provider/apt_preference.rb @@ -24,7 +24,7 @@ require "chef/log" class Chef class Provider class AptPreference < Chef::Provider - provides :apt_preference, os: "linux", platform_family: "debian" + provides :apt_preference, platform_family: "debian" APT_PREFERENCE_DIR = "/etc/apt/preferences.d".freeze diff --git a/lib/chef/provider/apt_repository.rb b/lib/chef/provider/apt_repository.rb index 2d86a6fce4..c16f1e5767 100644 --- a/lib/chef/provider/apt_repository.rb +++ b/lib/chef/provider/apt_repository.rb @@ -27,7 +27,7 @@ class Chef class AptRepository < Chef::Provider include Chef::Mixin::ShellOut - provides :apt_repository, os: "linux", platform_family: "debian" + provides :apt_repository, platform_family: "debian" LIST_APT_KEYS = "apt-key list".freeze LIST_APT_KEY_FINGERPRINTS = "apt-key adv --list-public-keys --with-fingerprint --with-colons".freeze diff --git a/lib/chef/provider/apt_update.rb b/lib/chef/provider/apt_update.rb index bfd9603e4e..9d794abcf0 100644 --- a/lib/chef/provider/apt_update.rb +++ b/lib/chef/provider/apt_update.rb @@ -23,7 +23,7 @@ require "chef/dsl/declare_resource" class Chef class Provider class AptUpdate < Chef::Provider - provides :apt_update, os: "linux", platform_family: "debian" + provides :apt_update, platform_family: "debian" APT_CONF_DIR = "/etc/apt/apt.conf.d" STAMP_DIR = "/var/lib/apt/periodic" diff --git a/lib/chef/provider/package/smartos.rb b/lib/chef/provider/package/smartos.rb index 8e4368f7c1..66d23554df 100644 --- a/lib/chef/provider/package/smartos.rb +++ b/lib/chef/provider/package/smartos.rb @@ -3,7 +3,7 @@ # Bryan McLellan (btm@loftninjas.org) # Matthew Landauer (matthew@openaustralia.org) # Ben Rockwood (benr@joyent.com) -# Copyright:: Copyright 2009-2016, Bryan McLellan, Matthew Landauer +# Copyright:: Copyright 2009-2018, Bryan McLellan, Matthew Landauer # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -30,7 +30,7 @@ class Chef attr_accessor :is_virtual_package provides :package, platform: "smartos" - provides :smartos_package, os: "solaris2", platform_family: "smartos" + provides :smartos_package, platform_family: "smartos" def load_current_resource Chef::Log.debug("#{new_resource} loading current resource") |