From: Chris Lamb Date: Tue, 27 Oct 2009 19:37:44 +0000 (+0000) Subject: Remove one level of indentation by using continue X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77f24ab2e895849746ffefd320ad1e71dd285380;p=dak Remove one level of indentation by using continue Signed-off-by: Chris Lamb --- diff --git a/daklib/queue.py b/daklib/queue.py index c2377294..bde44c17 100755 --- a/daklib/queue.py +++ b/daklib/queue.py @@ -1252,31 +1252,33 @@ class Upload(object): # W: tzdata: binary-without-manpage usr/sbin/tzconfig for line in output.split('\n'): m = re_parse_lintian.match(line) - if m: - etype = m.group(1) - epackage = m.group(2) - etag = m.group(3) - etext = m.group(4) - - # So lets check if we know the tag at all. - if etag in tags: - if etype == 'O': - # We know it and it is overriden. Check that override is allowed. - if lintiantags['warning'][etag]: - # The tag is overriden, and it is allowed to be overriden. - # Continue as if it isnt there. - next - elif lintiantags['error'][etag]: - # The tag is overriden - but is not allowed to be - self.rejects.append("%s: Overriden tag %s found, but this tag may not be overwritten." % (epackage, etag)) - return - else: - # Tag is known, it is not overriden, direct reject. - self.rejects.append("%s: Found lintian output: '%s %s', automatically rejected package." % (epackage, etag, etext)) - # Now tell if they *might* override it. - if lintiantags['wayout'][etag]: - self.rejects.append("%s: If you have a good reason, you may override this lintian tag. Laziness to fix your crap is NOT A GOOD REASON, sod off" % (epackage)) + if m is None: + continue + + etype = m.group(1) + epackage = m.group(2) + etag = m.group(3) + etext = m.group(4) + + # So lets check if we know the tag at all. + if etag in tags: + if etype == 'O': + # We know it and it is overriden. Check that override is allowed. + if lintiantags['warning'][etag]: + # The tag is overriden, and it is allowed to be overriden. + # Continue as if it isnt there. + next + elif lintiantags['error'][etag]: + # The tag is overriden - but is not allowed to be + self.rejects.append("%s: Overriden tag %s found, but this tag may not be overwritten." % (epackage, etag)) return + else: + # Tag is known, it is not overriden, direct reject. + self.rejects.append("%s: Found lintian output: '%s %s', automatically rejected package." % (epackage, etag, etext)) + # Now tell if they *might* override it. + if lintiantags['wayout'][etag]: + self.rejects.append("%s: If you have a good reason, you may override this lintian tag. Laziness to fix your crap is NOT A GOOD REASON, sod off" % (epackage)) + return ########################################################################### def check_urgency(self):