am 2d03a498: Merge "correct the setenv option judging condition"

* commit '2d03a498f9a1258740a9bbf6b28882506cde3ad9':
  correct the setenv option judging condition