@@ -50,7 +50,12 @@ def can_modify_job(username, job):
def get_acls(job):
if job.is_mr2:
- return job.acls
+ try:
+ acls = job.acls
+ except:
+ LOG.exception('failed to get acls')
+ acls = {}
+ return acls
else:
return job.full_job_conf
@@ -301,7 +301,7 @@ class Job(object):
@property
def acls(self):
if not hasattr(self, '_acls'):
- self._acls = dict([(name, self.conf_keys[name]) for name in self.conf_keys if 'acl' in name])
+ self._acls = dict([(name, self.conf_keys[name]) for name in self.conf_keys if name is not None and 'acl' in name])
return self._acls