X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fqueue.py;h=67e6563c6093a90ff8d1595cc456604e4aa65e7a;hb=760c7fcd88fa8d20ccc3df42d3853364d17f3a77;hp=e39b72d690e0a85d46db6b1fe8808d0ccc04aecf;hpb=d3f47b735f93cb7943e11ee91eaee44caf994c13;p=dak.git diff --git a/daklib/queue.py b/daklib/queue.py index e39b72d6..67e6563c 100755 --- a/daklib/queue.py +++ b/daklib/queue.py @@ -1445,16 +1445,15 @@ class Upload(object): self.check_dm_upload(fpr, session) else: # Check source-based permissions for other types - if self.pkg.changes["architecture"].has_key("source"): - if fpr.source_acl.access_level is None: - rej = 'Fingerprint %s may not upload source' % fpr.fingerprint - rej += '\nPlease contact ftpmaster if you think this is incorrect' - self.rejects.append(rej) - return - else: - # If not a DM, we allow full upload rights - uid_email = "%s@debian.org" % (fpr.uid.uid) - self.check_if_upload_is_sponsored(uid_email, fpr.uid.name) + if self.pkg.changes["architecture"].has_key("source") and \ + fpr.source_acl.access_level is None: + rej = 'Fingerprint %s may not upload source' % fpr.fingerprint + rej += '\nPlease contact ftpmaster if you think this is incorrect' + self.rejects.append(rej) + return + # If not a DM, we allow full upload rights + uid_email = "%s@debian.org" % (fpr.uid.uid) + self.check_if_upload_is_sponsored(uid_email, fpr.uid.name) # Check binary upload permissions