aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2019-07-21 13:22:44 +0200
committerGuido Günther <agx@sigxcpu.org>2019-07-21 13:22:44 +0200
commit78f8759a3d8e52e63aa3ec4dc2212989ae836494 (patch)
treef1a5db6e758700a45e15fb64160c7e0a390984eb
parent8afb7ee72ac66c97c12b97c0ae70fbc2adf4c15e (diff)
Fix over intended lines
(rightfully tripping up newer flake8) Gbp-Dch: Ignore
-rw-r--r--gbp/patch_series.py2
-rwxr-xr-xgbp/scripts/buildpackage.py4
-rw-r--r--gbp/scripts/common/import_orig.py4
-rw-r--r--gbp/scripts/import_orig.py2
4 files changed, 6 insertions, 6 deletions
diff --git a/gbp/patch_series.py b/gbp/patch_series.py
index 7b561e6..15af288 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 bd93997..2114ed0 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 d43a143..d31bab9 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 8b0b0fe..6d5c147 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)