Add "PW_" prefix to variables
Change-Id: I838e3f9196e4773b38c31da658851c2a0303a0bd
diff --git a/recipe_modules/environment/api.py b/recipe_modules/environment/api.py
index 239a394..f830efa 100644
--- a/recipe_modules/environment/api.py
+++ b/recipe_modules/environment/api.py
@@ -76,8 +76,12 @@
self._path_prefixes.append(self._cipd_dir.join('bin'))
self._ldpath_prefixes.append(self._cipd_dir)
self._ldpath_prefixes.append(self._cipd_dir.join('lib'))
+ # TODO(mohrr) remove these variables once no longer used.
self._env['CIPD_INSTALL_DIR'] = self._cipd_dir
self._env['PIGWEED_CIPD_INSTALL_DIR'] = self._cipd_dir
+ # End variables to remove.
+ self._env['PW_CIPD_INSTALL_DIR'] = self._cipd_dir
+ self._env['PW_PIGWEED_CIPD_INSTALL_DIR'] = self._cipd_dir
def _all_python_packages(self, checkout_root):
"""Return all folders with setup.py entries.
diff --git a/recipe_modules/environment/tests/full.expected/simple.json b/recipe_modules/environment/tests/full.expected/simple.json
index 22f8e37..47fa90e 100644
--- a/recipe_modules/environment/tests/full.expected/simple.json
+++ b/recipe_modules/environment/tests/full.expected/simple.json
@@ -115,6 +115,8 @@
"env": {
"CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+ "PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+ "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]"
},
"env_prefixes": {
@@ -144,6 +146,8 @@
"env": {
"CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+ "PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+ "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]"
},
"env_prefixes": {
@@ -180,6 +184,8 @@
"env": {
"CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+ "PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+ "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]",
"VIRTUAL_ENV": "[START_DIR]/venv"
},
@@ -211,6 +217,8 @@
"env": {
"CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+ "PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+ "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]",
"VIRTUAL_ENV": "[START_DIR]/venv"
},
diff --git a/recipes/pigweed.expected/pigweed.json b/recipes/pigweed.expected/pigweed.json
index f04aa2b..57f7ba2 100644
--- a/recipes/pigweed.expected/pigweed.json
+++ b/recipes/pigweed.expected/pigweed.json
@@ -392,6 +392,8 @@
"env": {
"CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+ "PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+ "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout"
},
"env_prefixes": {
@@ -421,6 +423,8 @@
"env": {
"CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+ "PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+ "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout"
},
"env_prefixes": {
@@ -457,6 +461,8 @@
"env": {
"CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+ "PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+ "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout",
"VIRTUAL_ENV": "[START_DIR]/venv"
},
@@ -488,6 +494,8 @@
"env": {
"CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+ "PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+ "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout",
"VIRTUAL_ENV": "[START_DIR]/venv"
},
@@ -521,6 +529,8 @@
"env": {
"CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+ "PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+ "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout",
"VIRTUAL_ENV": "[START_DIR]/venv"
},
diff --git a/recipes/pigweed.expected/step.json b/recipes/pigweed.expected/step.json
index 2c6b050..616e8b1 100644
--- a/recipes/pigweed.expected/step.json
+++ b/recipes/pigweed.expected/step.json
@@ -672,6 +672,8 @@
"env": {
"CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+ "PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+ "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout"
},
"env_prefixes": {
@@ -701,6 +703,8 @@
"env": {
"CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+ "PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+ "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout"
},
"env_prefixes": {
@@ -737,6 +741,8 @@
"env": {
"CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+ "PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+ "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout",
"VIRTUAL_ENV": "[START_DIR]/venv"
},
@@ -768,6 +774,8 @@
"env": {
"CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+ "PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+ "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout",
"VIRTUAL_ENV": "[START_DIR]/venv"
},
@@ -803,6 +811,8 @@
"env": {
"CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+ "PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+ "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout",
"VIRTUAL_ENV": "[START_DIR]/venv"
},
@@ -835,6 +845,8 @@
"env": {
"CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+ "PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+ "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout",
"VIRTUAL_ENV": "[START_DIR]/venv"
},
