From: Alfredo Deza <alfredo@deza.pe>
Date: Wed, 28 Aug 2013 16:38:20 +0000 (-0700)
Subject: Merge pull request #54 from ceph/sentry
X-Git-Tag: 1.1.0~1926
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a472f5017a0bd47d5cd65315fbc7c8bfd000ea3a;p=teuthology.git

Merge pull request #54 from ceph/sentry

Add logs and Sentry events to suite emails
---

a472f5017a0bd47d5cd65315fbc7c8bfd000ea3a
diff --cc teuthology/suite.py
index e8df8619e,1a3e13b22..087df2de5
--- a/teuthology/suite.py
+++ b/teuthology/suite.py
@@@ -460,24 -559,22 +561,26 @@@ def get_exclude_arch(configs)
      for config in configs:
          yamlfile = config[2]
          y = yaml.safe_load(file(yamlfile))
 -        os_type = y.get('exclude_arch')
 -        if os_type:
 -            return os_type
 +        if not y:
 +            y = {}
 +        exclude_arch = y.get('exclude_arch')
 +        if exclude_arch:
 +            return exclude_arch
      return None
  
+ 
  def get_exclude_os_type(configs):
      for config in configs:
          yamlfile = config[2]
          y = yaml.safe_load(file(yamlfile))
 -        os_type = y.get('exclude_os_type')
 -        if os_type:
 -            return os_type
 +        if not y:
 +            y = {}
 +        exclude_os_type = y.get('exclude_os_type')
 +        if exclude_os_type:
 +            return exclude_os_type
      return None
  
+ 
  def get_machine_type(config):
      for yamlfile in config:
          y = yaml.safe_load(file(yamlfile))