Changeset 80933

Timestamp:

07/21/11 13:02:51 (4 years ago)

Author:

jmr@…

Message:

merge r80932 from trunk:

move setting of LANG to the right place so it sticks

Location:

branches/release_2_0

Files:

• . (modified) (1 prop)
• base (modified) (1 prop)
• base/portmgr/fedora/macports.spec (modified) (1 prop)
• base/src/macports1.0/macports.tcl (modified) (2 diffs)
• base/src/pextlib1.0/sha2.c (modified) (1 prop)
• base/src/pextlib1.0/sha2.h (modified) (1 prop)
• base/src/pextlib1.0/sha256cmd.c (modified) (1 prop)
• base/src/pextlib1.0/sha256cmd.h (modified) (1 prop)
• base/src/registry2.0/receipt_sqlite.tcl (modified) (1 prop)

branches/release_2_0/base/src/macports1.0/macports.tcl

@@ -484 +484 @@
     # Set the system encoding to utf-8
     encoding system utf-8
-    set env(LANG) en_US.UTF-8
 
     # Ensure that the macports user directory exists if HOME is defined
@@ -847 +846 @@
         }
     }
+
+    # make tools we run operate in UTF-8 mode
+    set env(LANG) en_US.UTF-8
 
     if {![info exists xcodeversion] || ![info exists xcodebuildcmd]} {