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

* commit '3277dc269820e4d8785ea46d6a196145e7c88b78':
  correct the setenv option judging condition