Skip to content

Commit 83c1577

Browse files
committed
Merge branch 'master' of git@github.com:opscode/chef
2 parents 7043207 + 6179d4d commit 83c1577

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

chef/lib/chef/provider/package/portage.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
class Chef
2424
class Provider
2525
class Package
26-
class Portage < Chef::Provider::Package
26+
class Portage < Chef::Provider::Package
2727

2828
def load_current_resource
2929
@current_resource = Chef::Resource::Package.new(@new_resource.name)

chef/lib/chef/provider/package/rubygems.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,12 @@ def load_current_resource
8484
end
8585

8686
def install_package(name, version)
87+
src = nil
88+
if @new_resource.source
89+
src = " --source=#{@new_resource.source} --source=http://gems.rubyforge.org"
90+
end
8791
run_command(
88-
:command => "gem install #{name} -q --no-rdoc --no-ri -v #{version}#{' --source=' + @new_resource.source if @new_resource.source}"
92+
:command => "gem install #{name} -q --no-rdoc --no-ri -v #{version}#{src}"
8993
)
9094
end
9195

0 commit comments

Comments
 (0)