Browse files

Merge branch 'fix-1.8.5-incompatibilities' into 2.7rc

  • Loading branch information...
2 parents 3265b2c + da11dc7 commit 234afdf23ad94e66797bd9d4354139370f3f8548 @nicklewis nicklewis committed Dec 9, 2011
View
2 lib/puppet/transaction.rb
@@ -150,7 +150,7 @@ def eval_generate(resource)
begin
made = resource.eval_generate.uniq
return false if made.empty?
- made = Hash[made.map(&:name).zip(made)]
+ made = made.inject({}) {|a,v| a.merge(v.name => v) }
rescue => detail
puts detail.backtrace if Puppet[:trace]
resource.err "Failed to generate additional resources using 'eval_generate: #{detail}"
View
2 spec/integration/util/windows/security_spec.rb
@@ -123,7 +123,7 @@ class WindowsSecurityTester
end
describe "#mode=" do
- (0000..0700).step(0100).each do |mode|
+ (0000..0700).step(0100) do |mode|
it "should enforce mode #{mode.to_s(8)}" do
winsec.set_mode(mode, path)
View
2 spec/unit/file_bucket/dipper_spec.rb
@@ -123,7 +123,7 @@ def make_tmp_file(contents)
klass.any_instance.expects(:find).with { |r| request = r }.returns(Puppet::FileBucket::File.new(contents))
dipper.restore(dest, md5).should == md5
- Digest::MD5.file(dest).hexdigest.should == md5
+ Digest::MD5.hexdigest(Puppet::Util.binread(dest)).should == md5
request.key.should == "md5/#{md5}"
request.server.should == server

0 comments on commit 234afdf

Please sign in to comment.