From c7fb91eb34d54dc558f206ccfc44bb3129ab4e36 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 30 Jan 2019 16:08:52 +0100 Subject: [PATCH] Fix E117: over-indented (flake8 update on TW) --- build-fail-reminder.py | 2 +- deptool.py | 28 ++++++++++++++-------------- leaper.py | 6 +++--- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/build-fail-reminder.py b/build-fail-reminder.py index 9e9a0cad..57940ec8 100755 --- a/build-fail-reminder.py +++ b/build-fail-reminder.py @@ -34,7 +34,7 @@ class RemindedPackage(object): return '{} {} {} {}'.format(self.firstfail, self.reminded, self.bug, self.remindCount) def jdefault(o): - return o.__dict__ + return o.__dict__ MAIL_TEMPLATES = ( u"""Dear %(recepient)s, diff --git a/deptool.py b/deptool.py index 879a92b4..22c2b2f1 100755 --- a/deptool.py +++ b/deptool.py @@ -301,22 +301,22 @@ class DepTool(cmdln.Cmdln): logger.error("%s not found", n) continue for s in sel.solvables(): - prov = s.lookup_deparray(solv.SOLVABLE_PROVIDES, 0) - if not prov: - logger.error("%s doesn't provide anything") + prov = s.lookup_deparray(solv.SOLVABLE_PROVIDES, 0) + if not prov: + logger.error("%s doesn't provide anything") + continue + for p in prov: + sel = self.pool.matchdepid(p, solv.Selection.SELECTION_REL | solv.Selection.SELECTION_FLAT, kindid) + if sel.isempty(): + logger.debug('nothing %s %s', kind.lower(), p) continue - for p in prov: - sel = self.pool.matchdepid(p, solv.Selection.SELECTION_REL | solv.Selection.SELECTION_FLAT, kindid) - if sel.isempty(): - logger.debug('nothing %s %s', kind.lower(), p) + for r in sel.solvables(): + if kindid == solv.SOLVABLE_PROVIDES and r == s: continue - for r in sel.solvables(): - if kindid == solv.SOLVABLE_PROVIDES and r == s: - continue - if not kindprinted: - print(kind) - kindprinted = True - print(' {}: {}-{}@{}'.format(p, r.name, r.evr, r.arch)) + if not kindprinted: + print(kind) + kindprinted = True + print(' {}: {}-{}@{}'.format(p, r.name, r.evr, r.arch)) @cmdln.option("-r", "--repo", dest="repo", action="append", help="repo to use") diff --git a/leaper.py b/leaper.py index 91e5bfc6..353f01b2 100755 --- a/leaper.py +++ b/leaper.py @@ -443,9 +443,9 @@ class Leaper(ReviewBot.ReviewBot): # disabled for reference. Needed again for 16.0 probably if False and self.source_in_factory and target_project.startswith('openSUSE:Leap:15.0') \ and self.is_package_in_project('openSUSE:Leap:42.3'+subprj, package): - self.logger.info('package was in 42.3') - self.do_check_maintainer_review = False - return True + self.logger.info('package was in 42.3') + self.do_check_maintainer_review = False + return True is_fine_if_factory = True self.needs_release_manager = True