Skip to content

Commit 7777588

Browse files
committed
Doesn't need chef-extensions gem anymore
1 parent 2562caf commit 7777588

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

Diff for: metadata.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
license "Apache 2.0"
44
description "Configures apt and apt services and an LWRP for managing apt repositories"
55
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
6-
version "1.3.0"
6+
version "1.4.0"
77

88
recipe "apt", "Runs apt-get update during compile phase and sets up preseed directories"
99
recipe "apt::cacher", "Set up an APT cache"

Diff for: providers/repository.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
action :add do
2-
if Chef::Extensions.wan_up? && !::File.exists?("/etc/apt/sources.list.d/#{new_resource.repo_name}-source.list")
2+
if new_resource.wan_up? && !::File.exists?("/etc/apt/sources.list.d/#{new_resource.repo_name}-source.list")
33
Chef::Log.info "Adding #{new_resource.repo_name} repository to /etc/apt/sources.list.d/#{new_resource.repo_name}-source.list"
44
add_key!
55
create_or_update_repository!

Diff for: recipes/default.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@
1717
# limitations under the License.
1818
#
1919

20+
wan_up = `ping -c 1 -W 1 google.com`.index(/1 (?:packets )?received/)
2021

21-
if Chef::Extensions.wan_up?
22+
if wan_up
2223
chef_apt_update = ENV.fetch('CHEF_APT_UPDATE') { '' }
2324
execute "apt-get update" unless chef_apt_update.index("disable")
2425
end

Diff for: resources/repository.rb

+4
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,7 @@ def initialize(*args)
1515
super
1616
@action = :add
1717
end
18+
19+
def wan_up?
20+
`ping -c 1 -W 1 google.com`.index(/1 (?:packets )?received/)
21+
end

0 commit comments

Comments
 (0)