Explicitly pass PHABRICATOR_ENV and PHABRICATOR_INSTANCE to subprocesses
ClosedPublic
Actions

Authored by epriestley on Jan 5 2017, 10:33 PM.

Details

Reviewers

Maniphest Tasks

T12070: phd no longer recognizes PHABRICATOR_ENV?
T12071: Require "E" be defined in variables_order so $_ENV is correctly populated

Commits

rPHU35b57f7ab524: (stable) Promote 2017 Week 1
rPHUc5848b71c10f: Explicitly pass PHABRICATOR_ENV and PHABRICATOR_INSTANCE to subprocesses

Summary

Fixes T12070. Ref T12071. See T12071 for discussion.

D17100 changed things so that bin/repository gets an explicit TERM=dumb. As a side effect, this threw away the rest of the environment for installs with no "E" in variables_order. In particular, this means that "PHABRICATOR_ENV" may be dropped.

Since we're churning a lot and it's already Thursday, just patch this for now by reading "PHABRICATOR_ENV" out of the environment. I'll pursue more ambitious changes to fix this correctly after master promotes.

Test Plan

Patched Phabricator to log which PHABRICATOR_ENV it was reading to /tmp/env.log during startup.
Set variables_order to "GPCS" (no "E").
Ran PHABRICATOR_ENV=custom/porcupine ./bin/phd start.
- Before patch: bin/repository subprocess lauched with no PHABRICATOR_ENV.
- After patch: bin/repository subprocess gets PHABRICATOR_ENV correctly.

I also fiddled around with trying to fix this "right" without requiring config changes, but couldn't find or google anything that lets us rebuild $_ENV if variables_order is whack.