Don't add a new value to ENV if 'LC_ALL' doesn't exist to begin with.

myronmarston · Jul 17, 2010 · 11c6c8f · 11c6c8f
1 parent 4d94329
commit 11c6c8f
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/core/encoding/locale_charmap_spec.rb b/core/encoding/locale_charmap_spec.rb
@@ -12,7 +12,11 @@
         old_lc_all = ENV['LC_ALL']
         ENV['LC_ALL'] = 'C'
         ruby_exe("print Encoding.locale_charmap").should == 'ANSI_X3.4-1968'
-        ENV['LC_ALL'] = old_lc_all
+        if old_lc_all == nil
+          ENV.delete('LC_ALL')
+        else
+          ENV['LC_ALL'] = old_lc_all
+        end
       end
     end
 
@@ -21,7 +25,11 @@
         old_lc_all = ENV['LC_ALL']
         ENV['LC_ALL'] = 'C'
         ruby_exe("print Encoding.locale_charmap").should == 'US-ASCII'
-        ENV['LC_ALL'] = old_lc_all
+        if old_lc_all == nil
+          ENV.delete('LC_ALL')
+        else
+          ENV['LC_ALL'] = old_lc_all
+        end
       end
     end
 
@@ -31,7 +39,11 @@
         old_lc_all = ENV['LC_ALL']
         ENV['LC_ALL'] = 'C'
         Encoding.locale_charmap.should == old_charmap
-        ENV['LC_ALL'] = old_lc_all
+        if old_lc_all == nil
+          ENV.delete('LC_ALL')
+        else
+          ENV['LC_ALL'] = old_lc_all
+        end
       end
     end
   end