Skip to content

Commit

Permalink
Changed load_env -> loadenv.
Browse files Browse the repository at this point in the history
This better aligns the function name with other similar
helpers in catkin_tools.jobs.utils.
  • Loading branch information
mikepurvis committed Aug 10, 2016
1 parent 8cf709d commit b9f72d9
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
8 changes: 4 additions & 4 deletions catkin_tools/jobs/catkin.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions catkin_tools/jobs/cmake.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion catkin_tools/jobs/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions catkin_tools/verbs/catkin_build/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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),
Expand Down

0 comments on commit b9f72d9

Please sign in to comment.