From eb1f5e3bb40be1af8f427f5837bc1ac8a996f6a7 Mon Sep 17 00:00:00 2001 From: Maciej Szulik Date: Fri, 13 Feb 2015 18:00:45 +0100 Subject: [PATCH] Bug 1192557 - Fixed creating application using --from-code=empty when database cartridge is also specified. --- node/lib/openshift-origin-node/model/v2_cart_model.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/node/lib/openshift-origin-node/model/v2_cart_model.rb b/node/lib/openshift-origin-node/model/v2_cart_model.rb index 598bc199514..7155f07b5f7 100644 --- a/node/lib/openshift-origin-node/model/v2_cart_model.rb +++ b/node/lib/openshift-origin-node/model/v2_cart_model.rb @@ -380,8 +380,8 @@ def post_configure(cartridge_name) cartridge = get_cartridge(name) ::OpenShift::Runtime::Utils::Cgroups.new(@container.uuid).boost do - if empty_repository? - output << "CLIENT_MESSAGE: An empty Git repository has been created for your application. Use 'git push' to add your code." if cartridge.name == primary_cartridge.name + if cartridge.name == primary_cartridge.name and empty_repository? + output << "CLIENT_MESSAGE: An empty Git repository has been created for your application. Use 'git push' to add your code." else output << start_cartridge('start', cartridge, user_initiated: true) end