lib/autoproj/cli/exec.rb in autoproj-2.9.0 vs lib/autoproj/cli/exec.rb in autoproj-2.10.0

- old
+ new

@@ -6,42 +6,40 @@ module Autoproj module CLI class Exec def initialize @root_dir = Autoproj.find_workspace_dir - if !@root_dir + unless @root_dir require 'autoproj/workspace' # Will do all sorts of error reporting, # or may be able to resolve @root_dir = Workspace.default.root_dir end end def load_cached_env env = Ops.load_cached_env(@root_dir) - return if !env + return unless env Autobuild::Environment. environment_from_export(env, ENV) end def run(cmd, *args, use_cached_env: Ops.watch_running?(@root_dir)) - if use_cached_env - env = load_cached_env - end + env = load_cached_env if use_cached_env - if !env + unless env require 'autoproj' require 'autoproj/cli/inspection_tool' ws = Workspace.from_dir(@root_dir) loader = InspectionTool.new(ws) loader.initialize_and_load loader.finalize_setup(Array.new) env = ws.full_env.resolved_env end path = env['PATH'].split(File::PATH_SEPARATOR) - program = + program = begin Ops.which(cmd, path_entries: path) rescue ::Exception => e require 'autoproj' raise CLIInvalidArguments, e.message, e.backtrace end