On Fri, Mar 11, 2011 at 02:40:12PM +0000, mtaylor(a)redhat.com wrote:
From: Martyn Taylor <mtaylor(a)redhat.com>
---
src/app/util/condormatic.rb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/app/util/condormatic.rb b/src/app/util/condormatic.rb
index cf038dd..efe77f1 100644
--- a/src/app/util/condormatic.rb
+++ b/src/app/util/condormatic.rb
@@ -250,7 +250,7 @@ def condormatic_classads_sync
account, provider_image, hwp, realm, frontend_realm = *ad
matching_hardware_profile =
HardwareProfile.match_provider_hardware_profile(account.provider, hwp)
- if(matching_hardware_profile != nil)
+ if(matching_hardware_profile != nil) &&
(provider_image.image.template.architecture == hwp.architecture.value)
overrides = HardwareProfile.generate_override_property_values(hwp,
matching_hardware_profile)
pipe = IO.popen("condor_advertise UPDATE_STARTD_AD 2>&1",
"w+")
--
1.7.4
ACK