Skip to content
Snippets Groups Projects
Commit 466f1c9e authored by Dylan Aïssi's avatar Dylan Aïssi
Browse files

Fix issues detected by flake8

parent 95ba2cc9
No related branches found
No related tags found
1 merge request!88import-debian-package: don't trigger pipeline on downstream, instead create a merge request
......@@ -32,7 +32,6 @@ from debian.changelog import Changelog, VersionError, format_date
from debian.debian_support import Version
from gbp.deb.git import DebianGitRepository
from gbp.scripts.import_dsc import main as gbp_import_dsc_orig
from gbp.scripts.import_dscs import set_gbp_conf_files
from sh import debsnap, dget
from sh.contrib import git
......@@ -152,7 +151,7 @@ def get_debian_dsc_path(package: str, version: Version) -> str:
data = json.loads(response.read().decode("utf-8"))
except KeyboardInterrupt:
raise
except HTTPError as e:
except HTTPError:
raise KeyError((package, None))
for filehash, fileinfo in data["fileinfo"].items():
for i in fileinfo:
......@@ -309,7 +308,7 @@ def fetch(package: str, version: str, url: str, downloaddir: str, cached_dsc: st
debsnap(package, version, force=True, destdir=downloaddir, _fg=True)
except KeyboardInterrupt:
raise
except (HTTPError, URLError) as e:
except (HTTPError, URLError):
if cached_dsc:
logging.info(f"Using cached {cached_dsc}")
else:
......@@ -378,7 +377,7 @@ def do_import(args):
version = get_debian_package_version(upstream, package)
except KeyboardInterrupt:
raise
except KeyError as e:
except KeyError:
raise Abort(f"Unable to find package {package} version {version}")
version = Version(version)
......@@ -407,7 +406,7 @@ def do_import(args):
url = args.mirror.rstrip("/") + get_debian_dsc_path(package, version)
except KeyboardInterrupt:
raise
except (KeyError, HTTPError, URLError) as e:
except (KeyError, HTTPError, URLError):
if not cached_dsc:
raise Abort(
f"Unable to download source package {package} version {version}"
......@@ -453,10 +452,6 @@ def do_import(args):
"-m",
f"Import Apertis version {overlay_version}",
)
new_tag = DebianGitRepository.version_to_tag(
"apertis/%(version)s", str(overlay_version)
)
# git.tag('-a', '-m', f'Apertis version {overlay_version}', new_tag)
logging.info("Storing the original tarballs")
pristine_lfs("import-dsc", args.dsc.name)
# pristine_lfs('import-dsc', '--full', '-b', 'pristine-lfs-source', args.dsc.name)
......@@ -491,7 +486,7 @@ def do_import(args):
try:
remote_url = git("remote", "get-url", "origin")
logging.warning(f"Remote was already set to: {remote_url}")
logging.warning(f"Will overwrite with remote repository url")
logging.warning("Will overwrite with remote repository url")
git("remote", "set-url", "origin", project.ssh_url_to_repo)
except:
git("remote", "add", "origin", project.ssh_url_to_repo)
......@@ -508,7 +503,7 @@ def do_import(args):
)
logging.info("Creating merge request")
mr = project.mergerequests.create(
project.mergerequests.create(
{
"source_branch": f"proposed-package/{downstream}",
"target_branch": downstream,
......@@ -673,7 +668,7 @@ def main(argv):
print(_("Failed to run %s:") % e.full_cmd, file=sys.stderr)
print(e.stderr.decode(sh.DEFAULT_ENCODING, "replace"), file=sys.stderr)
sys.exit(e.exit_code)
except KeyboardInterrupt as e:
except KeyboardInterrupt:
print(file=sys.stderr)
print(_("about: Interrupted by user"), file=sys.stderr)
sys.exit(1)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment