compat: make sure we don't over LC_CYTPE / LANG

If --action_env is being passed then the repo expects it to hit all the actions, by forcing LANG/LC_CTYPE to override we're removing that use case
bazelbuild · Dec 27, 2023 · 688d7ac · 688d7ac
1 parent de2eedd
commit 688d7ac
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/pkg/legacy/rpm.bzl b/pkg/legacy/rpm.bzl
@@ -125,8 +125,8 @@ def _pkg_rpm_impl(ctx):
         inputs = files,
         outputs = [ctx.outputs.rpm],
         env = {
-            "LANG": "en_US.UTF-8",
-            "LC_CTYPE": "UTF-8",
+            "LANG": ctx.configuration.default_shell_env.get("LANG", "en_US.UTF-8"),
+            "LC_CTYPE": ctx.configuration.default_shell_env.get("LC_CTYPE", "UTF-8"),
             "PYTHONIOENCODING": "UTF-8",
             "PYTHONUTF8": "1",
         },

diff --git a/pkg/private/deb/deb.bzl b/pkg/private/deb/deb.bzl
@@ -155,8 +155,8 @@ def _pkg_deb_impl(ctx):
         inputs = files,
         outputs = [output_file, changes_file],
         env = {
-            "LANG": "en_US.UTF-8",
-            "LC_CTYPE": "UTF-8",
+            "LANG": ctx.configuration.default_shell_env.get("LANG", "en_US.UTF-8"),
+            "LC_CTYPE": ctx.configuration.default_shell_env.get("LC_CTYPE", "UTF-8"),
             "PYTHONIOENCODING": "UTF-8",
             "PYTHONUTF8": "1",
         },

diff --git a/pkg/private/tar/tar.bzl b/pkg/private/tar/tar.bzl
@@ -187,8 +187,8 @@ def _pkg_tar_impl(ctx):
         arguments = [args],
         outputs = [output_file],
         env = {
-            "LANG": "en_US.UTF-8",
-            "LC_CTYPE": "UTF-8",
+            "LANG": ctx.configuration.default_shell_env.get("LANG", "en_US.UTF-8"),
+            "LC_CTYPE": ctx.configuration.default_shell_env.get("LC_CTYPE", "UTF-8"),
             "PYTHONIOENCODING": "UTF-8",
             "PYTHONUTF8": "1",
         },

diff --git a/pkg/private/zip/zip.bzl b/pkg/private/zip/zip.bzl
@@ -72,8 +72,8 @@ def _pkg_zip_impl(ctx):
         arguments = [args],
         outputs = [output_file],
         env = {
-            "LANG": "en_US.UTF-8",
-            "LC_CTYPE": "UTF-8",
+            "LANG": ctx.configuration.default_shell_env.get("LANG", "en_US.UTF-8"),
+            "LC_CTYPE": ctx.configuration.default_shell_env.get("LC_CTYPE", "UTF-8"),
             "PYTHONIOENCODING": "UTF-8",
             "PYTHONUTF8": "1",
         },

diff --git a/pkg/releasing/git.bzl b/pkg/releasing/git.bzl
@@ -44,8 +44,8 @@ def _git_changelog_impl(ctx):
         arguments = [args],
         outputs = [ctx.outputs.out],
         env = {
-            "LANG": "en_US.UTF-8",
-            "LC_CTYPE": "UTF-8",
+            "LANG": ctx.configuration.default_shell_env.get("LANG", "en_US.UTF-8"),
+            "LC_CTYPE": ctx.configuration.default_shell_env.get("LC_CTYPE", "UTF-8"),
             "PYTHONIOENCODING": "UTF-8",
             "PYTHONUTF8": "1",
         },

diff --git a/pkg/rpm_pfg.bzl b/pkg/rpm_pfg.bzl
@@ -675,8 +675,8 @@ def _pkg_rpm_impl(ctx):
         inputs = files,
         outputs = [output_file],
         env = {
-            "LANG": "en_US.UTF-8",
-            "LC_CTYPE": "UTF-8",
+            "LANG": ctx.configuration.default_shell_env.get("LANG", "en_US.UTF-8"),
+            "LC_CTYPE": ctx.configuration.default_shell_env.get("LC_CTYPE", "UTF-8"),
             "PYTHONIOENCODING": "UTF-8",
             "PYTHONUTF8": "1",
         },