[PATCH conductor] fix regresion introduced by BZ#801971

Tomáš Hrčka thrcka at redhat.com
Thu Jun 14 08:55:29 UTC 2012


---
 src/app/models/pool.rb |   18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/app/models/pool.rb b/src/app/models/pool.rb
index 090b3bd..915cae2 100644
--- a/src/app/models/pool.rb
+++ b/src/app/models/pool.rb
@@ -163,13 +163,19 @@ class Pool < ActiveRecord::Base
     catalog_list.each do |catalog|
       catalog.deployables.each do |deployable|
         deployable.fetch_unique_images.each do |key,value|
-          row = {:catalog => catalog.name ,:deployable => deployable.name,
-                 :image => "#{value[:image].name} #{value[:image].uuid}", :provider_images =>[] }
-
-          value[:image].provider_images.each do |provider_image|
-            row[:provider_images] << I18n.t('pools.images.pushed', :uuid => provider_image.uuid, :provider => provider_image.provider_name)
+          if value[:image].present?
+            row = {:catalog => catalog.name ,:deployable => deployable.name,
+                   :image => "#{value[:image].name} #{value[:image].uuid}",
+                   :provider_images =>[] }
+
+            value[:image].provider_images.each do |provider_image|
+              row[:provider_images] << I18n.t('pools.images.pushed',
+                                              :uuid => provider_image.uuid,
+                                              :provider => provider_image.provider_name)
+
+            end
+            value[:count].times { catalog_images << row }
           end
-          value[:count].times {catalog_images << row}
         end
       end
     end
-- 
1.7.10.2




More information about the aeolus-devel mailing list