Skip to content

Commit

Permalink
fix vmc push prompting even with -n
Browse files Browse the repository at this point in the history
Change-Id: Ie7927b2c49ea1d36688faf8b737f0cf0552693ae
  • Loading branch information
vito committed Dec 16, 2011
1 parent c8db02a commit c283385
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions lib/cli/commands/apps.rb
Expand Up @@ -814,7 +814,7 @@ def do_stop(appname)
end

def do_push(appname=nil)
unless @app_info
unless @app_info || no_prompt
@manifest = { "applications" => { @path => { "name" => appname } } }

interact
Expand Down Expand Up @@ -882,12 +882,13 @@ def do_push(appname=nil)

if ignore_framework
framework = VMC::Cli::Framework.new
else
f = info(:framework)
elsif f = info(:framework)
info = Hash[f["info"].collect { |k, v| [k.to_sym, v] }]

framework = VMC::Cli::Framework.new(f["name"], info)
exec = framework.exec if framework && framework.exec
else
framework = detect_framework(prompt_ok)
end

err "Application Type undetermined for path '#{@application}'" unless framework
Expand Down Expand Up @@ -929,7 +930,7 @@ def do_push(appname=nil)

existing = Set.new(client.services.collect { |s| s[:name] })

if services = @app_info["services"]
if @app_info && services = @app_info["services"]
services.each do |name, info|
unless existing.include? name
create_service_banner(info["type"], name, true)
Expand Down

0 comments on commit c283385

Please sign in to comment.