зеркало из https://github.com/github/ruby.git
* process.c (save_env): don't use EXEC_OPTION_UNSETENV_OTHERS.
(rb_execarg_run_options): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36198 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
26ecb6cbc4
Коммит
92af9dddc8
|
@ -1,3 +1,8 @@
|
|||
Sat Jun 23 17:22:02 2012 Tanaka Akira <akr@fsij.org>
|
||||
|
||||
* process.c (save_env): don't use EXEC_OPTION_UNSETENV_OTHERS.
|
||||
(rb_execarg_run_options): ditto.
|
||||
|
||||
Sat Jun 23 17:04:08 2012 Tanaka Akira <akr@fsij.org>
|
||||
|
||||
* internal.h (rb_execarg): add env_modification field.
|
||||
|
|
|
@ -2713,7 +2713,8 @@ save_env(struct rb_execarg *sargp)
|
|||
(VALUE)ary);
|
||||
sargp->env_modification = ary;
|
||||
}
|
||||
rb_ary_store(soptions, EXEC_OPTION_UNSETENV_OTHERS, Qtrue);
|
||||
sargp->unsetenv_others_given = 1;
|
||||
sargp->unsetenv_others_do = 1;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
@ -2751,8 +2752,7 @@ rb_execarg_run_options(const struct rb_execarg *eargp, struct rb_execarg *sargp,
|
|||
#endif
|
||||
|
||||
#if !defined(HAVE_FORK)
|
||||
obj = rb_ary_entry(options, EXEC_OPTION_UNSETENV_OTHERS);
|
||||
if (RTEST(obj)) {
|
||||
if (eargp->unsetenv_others_given && eargp->unsetenv_others_do) {
|
||||
save_env(sargp);
|
||||
rb_env_clear();
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче