From b9f72d9ace96477b3132ae6f8a0da525c52fddef Mon Sep 17 00:00:00 2001
From: Mike Purvis <mpurvis@clearpathrobotics.com>
Date: Wed, 10 Aug 2016 16:15:24 -0400
Subject: [PATCH] Changed load_env -> loadenv.

This better aligns the function name with other similar
helpers in catkin_tools.jobs.utils.
---
 catkin_tools/jobs/catkin.py            | 8 ++++----
 catkin_tools/jobs/cmake.py             | 8 ++++----
 catkin_tools/jobs/utils.py             | 2 +-
 catkin_tools/verbs/catkin_build/cli.py | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/catkin_tools/jobs/catkin.py b/catkin_tools/jobs/catkin.py
index 9cbca04e..6ce9c37a 100644
--- a/catkin_tools/jobs/catkin.py
+++ b/catkin_tools/jobs/catkin.py
@@ -35,7 +35,7 @@
 from .commands.make import MAKE_EXEC
 
 from .utils import copyfiles
-from .utils import load_env
+from .utils import loadenv
 from .utils import makedirs
 from .utils import rmfiles
 
@@ -357,10 +357,10 @@ def create_catkin_build_job(context, package, package_path, dependencies, force_
     # Create job stages
     stages = []
 
-    # Get environment for job.
+    # Load environment for job.
     stages.append(FunctionStage(
-        'getenv',
-        load_env,
+        'loadenv',
+        loadenv,
         locked_resource='installspace',
         job_env=job_env,
         package=package,
diff --git a/catkin_tools/jobs/cmake.py b/catkin_tools/jobs/cmake.py
index ef94bf45..9f2c349b 100644
--- a/catkin_tools/jobs/cmake.py
+++ b/catkin_tools/jobs/cmake.py
@@ -31,7 +31,7 @@
 from .commands.make import MAKE_EXEC
 
 from .utils import copyfiles
-from .utils import load_env
+from .utils import loadenv
 from .utils import makedirs
 from .utils import rmfiles
 
@@ -228,10 +228,10 @@ def create_cmake_build_job(context, package, package_path, dependencies, force_c
     # Create job stages
     stages = []
 
-    # Get environment for job.
+    # Load environment for job.
     stages.append(FunctionStage(
-        'getenv',
-        load_env,
+        'loadenv',
+        loadenv,
         locked_resource='installspace',
         job_env=job_env,
         package=package,
diff --git a/catkin_tools/jobs/utils.py b/catkin_tools/jobs/utils.py
index cd42cbf7..eefd9b0a 100644
--- a/catkin_tools/jobs/utils.py
+++ b/catkin_tools/jobs/utils.py
@@ -50,7 +50,7 @@ def get_env_loaders(package, context):
     return sources
 
 
-def load_env(logger, event_queue, job_env, package, context):
+def loadenv(logger, event_queue, job_env, package, context):
     # Get the paths to the env loaders
     env_loader_paths = get_env_loaders(package, context)
     # If DESTDIR is set, set _CATKIN_SETUP_DIR as well
diff --git a/catkin_tools/verbs/catkin_build/cli.py b/catkin_tools/verbs/catkin_build/cli.py
index f5bb4c7c..460a3466 100644
--- a/catkin_tools/verbs/catkin_build/cli.py
+++ b/catkin_tools/verbs/catkin_build/cli.py
@@ -48,7 +48,7 @@
 
 import catkin_tools.execution.job_server as job_server
 
-from catkin_tools.jobs.utils import load_env
+from catkin_tools.jobs.utils import loadenv
 
 from catkin_tools.metadata import find_enclosing_workspace
 from catkin_tools.metadata import get_metadata
@@ -229,7 +229,7 @@ def print_build_env(context, package_name):
     for pth, pkg in workspace_packages.items():
         if pkg.name == package_name:
             environ = dict(os.environ)
-            load_env(None, None, environ, pkg, context)
+            loadenv(None, None, environ, pkg, context)
             print(format_env_dict(environ))
             return 0
     print('[build] Error: Package `{}` not in workspace.'.format(package_name),