diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-07-09 22:34:58 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-07-09 22:34:58 +0000 |
| commit | cd9f9e471977447a991ced4ea38efb2309459ef5 (patch) | |
| tree | 88407787fcd2c8346aa312195ae4b557abacadaa /lib | |
| parent | dafbdd6816f550e1989881ae0c19efd188e932c5 (diff) | |
* lib/rubygems/ext/ext_conf_builder.rb: Remove siteconf file after
building the gem.
* test/rubygems/test_gem_ext_ext_conf_builder.rb: Test for the above.
* lib/rubygems/psych_tree.rb (module Gem): Add backward compatibility
for r41148
* test/rubygems/test_gem_package.rb: Add backward compatibility for
double-slash elimination.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41872 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rubygems/ext/ext_conf_builder.rb | 1 | ||||
| -rw-r--r-- | lib/rubygems/psych_tree.rb | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/lib/rubygems/ext/ext_conf_builder.rb b/lib/rubygems/ext/ext_conf_builder.rb index d09cb5266f..70b57bd47b 100644 --- a/lib/rubygems/ext/ext_conf_builder.rb +++ b/lib/rubygems/ext/ext_conf_builder.rb @@ -37,6 +37,7 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder run cmd, results ENV["DESTDIR"] = nil + siteconf.unlink make dest_path, results diff --git a/lib/rubygems/psych_tree.rb b/lib/rubygems/psych_tree.rb index eca8249383..e3f1d1a08a 100644 --- a/lib/rubygems/psych_tree.rb +++ b/lib/rubygems/psych_tree.rb @@ -1,6 +1,10 @@ module Gem if defined? ::Psych::Visitors class NoAliasYAMLTree < Psych::Visitors::YAMLTree + def self.create + new({}) + end unless respond_to? :create + def visit_String(str) return super unless str == '=' # or whatever you want |