From 78f8759a3d8e52e63aa3ec4dc2212989ae836494 Mon Sep 17 00:00:00 2001 From: Guido Günther Date: Sun, 21 Jul 2019 13:22:44 +0200 Subject: Fix over intended lines (rightfully tripping up newer flake8) Gbp-Dch: Ignore --- gbp/patch_series.py | 2 +- gbp/scripts/buildpackage.py | 4 ++-- gbp/scripts/common/import_orig.py | 4 ++-- gbp/scripts/import_orig.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gbp/patch_series.py b/gbp/patch_series.py index 7b561e62..15af2884 100644 --- a/gbp/patch_series.py +++ b/gbp/patch_series.py @@ -145,7 +145,7 @@ class Patch(object): if ext in self.patch_exts: subject = base except ValueError: - pass # No ext so keep subject as is + pass # No ext so keep subject as is return subject.lstrip('0123456789-') or subject def _get_info_field(self, key, get_val=None): diff --git a/gbp/scripts/buildpackage.py b/gbp/scripts/buildpackage.py index bd939974..2114ed05 100755 --- a/gbp/scripts/buildpackage.py +++ b/gbp/scripts/buildpackage.py @@ -330,8 +330,8 @@ def check_branch(repo, options): ignore = options.ignore_new or options.ignore_branch if branch != options.debian_branch and not ignore: - gbp.log.err("You are not on branch '%s' but on '%s'" % (options.debian_branch, branch)) - raise GbpError("Use --git-ignore-branch to ignore or --git-debian-branch to set the branch name.") + gbp.log.err("You are not on branch '%s' but on '%s'" % (options.debian_branch, branch)) + raise GbpError("Use --git-ignore-branch to ignore or --git-debian-branch to set the branch name.") return branch diff --git a/gbp/scripts/common/import_orig.py b/gbp/scripts/common/import_orig.py index d43a1432..d31bab97 100644 --- a/gbp/scripts/common/import_orig.py +++ b/gbp/scripts/common/import_orig.py @@ -68,8 +68,8 @@ def cleanup_tmp_tree(tree): def is_link_target(target, link): """does symlink link already point to target?""" if os.path.exists(link): - if os.path.samefile(target, link): - return True + if os.path.samefile(target, link): + return True return False diff --git a/gbp/scripts/import_orig.py b/gbp/scripts/import_orig.py index 8b0b0fe4..6d5c147b 100644 --- a/gbp/scripts/import_orig.py +++ b/gbp/scripts/import_orig.py @@ -79,7 +79,7 @@ def prepare_pristine_tar(archive, pkg, version): os.symlink(os.path.abspath(archive), link) linked = True except OSError as err: - raise GbpError("Cannot symlink '%s' to '%s': %s" % (archive, link, err[1])) + raise GbpError("Cannot symlink '%s' to '%s': %s" % (archive, link, err[1])) return (link, linked) else: return (archive, linked) -- cgit v1.2.3