File tree Expand file tree Collapse file tree 4 files changed +2
-18
lines changed Expand file tree Collapse file tree 4 files changed +2
-18
lines changed Original file line number Diff line number Diff line change @@ -451,12 +451,8 @@ absl::StatusOr<int> Run(const std::string_view binary,
451
451
final_args.insert (final_args.end (), runfiles_args.begin (),
452
452
runfiles_args.end ());
453
453
final_args.insert (final_args.end (), args.begin (), args.end ());
454
- absl::StatusOr<Environment> orig_env = CopyEnv ();
454
+ const absl::StatusOr<Environment> orig_env = CopyEnv ();
455
455
if (!orig_env.ok ()) return orig_env.status ();
456
- // We don’t want the Python launcher to change the current working directory,
457
- // otherwise relative filenames will be all messed up. See
458
- // https://github.com/bazelbuild/bazel/issues/7190.
459
- orig_env->erase (RULES_ELISP_NATIVE_LITERAL (" RUN_UNDER_RUNFILES" ));
460
456
map->insert (orig_env->begin (), orig_env->end ());
461
457
std::vector<NativeString> final_env;
462
458
for (const auto & [key, value] : *map) {
Original file line number Diff line number Diff line change @@ -53,10 +53,6 @@ def main() -> None:
53
53
parser .add_argument ('argv' , nargs = '+' )
54
54
opts = parser .parse_args ()
55
55
env : dict [str , str ] = dict (os .environ )
56
- # We don’t want the Python launcher to change the current working directory,
57
- # otherwise relative filenames will be all messed up. See
58
- # https://github.com/bazelbuild/bazel/issues/7190.
59
- env .pop ('RUN_UNDER_RUNFILES' , None )
60
56
run_files = runfiles .Runfiles (dict (opts .runfiles_env ))
61
57
emacs = run_files .resolve (opts .wrapper )
62
58
args : list [str ] = [str (emacs )]
Original file line number Diff line number Diff line change 1
- # Copyright 2021, 2022, 2023 Google LLC
1
+ # Copyright 2021, 2022, 2023, 2024 Google LLC
2
2
#
3
3
# Licensed under the Apache License, Version 2.0 (the "License");
4
4
# you may not use this file except in compliance with the License.
@@ -55,10 +55,6 @@ def main() -> None:
55
55
EMACSDOC = str (etc ),
56
56
EMACSLOADPATH = str (shared / 'lisp' ),
57
57
EMACSPATH = str (libexec ))
58
- # We don’t want the Python launcher to change the current working
59
- # directory, otherwise relative filenames will be all messed up. See
60
- # https://github.com/bazelbuild/bazel/issues/7190.
61
- env .pop ('RUN_UNDER_RUNFILES' , None )
62
58
env .update (opts .env )
63
59
env .update (run_files .environment ())
64
60
if os .name == 'nt' :
Original file line number Diff line number Diff line change @@ -62,10 +62,6 @@ def main() -> None:
62
62
logging .basicConfig (level = logging .INFO ,
63
63
format = '%(asctime)s %(levelname)s %(name)s %(message)s' )
64
64
env : dict [str , str ] = dict (os .environ )
65
- # We don’t want the Python launcher to change the current working directory,
66
- # otherwise relative filenames will be all messed up. See
67
- # https://github.com/bazelbuild/bazel/issues/7190.
68
- env .pop ('RUN_UNDER_RUNFILES' , None )
69
65
run_files = runfiles .Runfiles (dict (opts .runfiles_env ))
70
66
emacs = run_files .resolve (opts .wrapper )
71
67
args : list [str ] = [str (emacs )]
You can’t perform that action at this time.
0 commit comments