Some whitespace and ruby -c fixes

bug/bundler_fix
James Lee 2013-01-10 17:29:54 -06:00
parent ab64c428ab
commit 0f346dde9e
1 changed files with 3 additions and 8 deletions

View File

@ -128,7 +128,6 @@ class Console::CommandDispatcher::Core
mode = nil
chan = nil
data = []
# Parse options
@@channel_opts.parse(args) { |opt, idx, val|
@ -331,7 +330,6 @@ class Console::CommandDispatcher::Core
#
# @param args [Array<String>] Commandline arguments, only -h or a pid
# @return [void]
def cmd_migrate(*args)
if ( args.length == 0 or args.include?("-h") )
cmd_migrate_help
@ -367,8 +365,6 @@ class Console::CommandDispatcher::Core
args.unshift("-h")
end
modules = nil
@@load_opts.parse(args) { |opt, idx, val|
case opt
when "-l"
@ -503,11 +499,11 @@ class Console::CommandDispatcher::Core
reloaded_mod = client.framework.modules.reload_module(original_mod)
unless reloaded_mod
error = client.framework.modules.module_load_error_by_path[original_mod.file_path]
error = client.framework.modules.module_load_error_by_path[original_mod.file_path]
print_error("Failed to reload module: #{error}")
return
end
end
opts = (args + [ "SESSION=#{client.sid}" ]).join(',')
reloaded_mod.run_simple(
@ -694,8 +690,7 @@ class Console::CommandDispatcher::Core
}
# Find the channel associated with this cid, assuming the cid is valid.
if ((!cid) or
(!(channel = client.find_channel(cid))))
if ((!cid) or (!(channel = client.find_channel(cid))))
print_error("Invalid channel identifier specified.")
return true
end