From 3eb66257e8a93e9c72c8d02311f23b6db4f31b4f Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 17 Oct 2017 15:46:18 +0200 Subject: [PATCH] Rename checknewer to checknewer.py and fix Flake8 fallout This is a python script so as the majority of scripts in here it should end in a .py suffix --- README.asciidoc | 2 +- checknewer => checknewer.py | 28 ++++++++++++++-------------- tests/__init__.py | 1 - 3 files changed, 15 insertions(+), 16 deletions(-) rename checknewer => checknewer.py (82%) diff --git a/README.asciidoc b/README.asciidoc index ad172024..10c9709a 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -32,7 +32,7 @@ Scripts * *link:docs/maintbot.asciidoc[maintbot].* script that checks maintenance incidents to make sure the Factory maintainer submitted the package. -* *link:checknewer[checknewer].* script compares version numbers in repos to +* *link:checknewer.py[checknewer.py].* script compares version numbers in repos to make sure all packages e.g. in a new distro are newer Installation diff --git a/checknewer b/checknewer.py similarity index 82% rename from checknewer rename to checknewer.py index bcd98964..7d8f0814 100755 --- a/checknewer +++ b/checknewer.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2 # Copyright (c) 2016 SUSE LLC # # Permission is hereby granted, free of charge, to any person obtaining a copy @@ -29,24 +29,24 @@ import solv pool = solv.Pool() args = sys.argv[1:] if len(args) < 2: - print("usage: checknewer NEWREPO OLDREPO1 [OLDREPO2...]") - sys.exit(1) + print("usage: checknewer NEWREPO OLDREPO1 [OLDREPO2...]") + sys.exit(1) firstrepo = None for arg in args: - argf = solv.xfopen(arg) - repo = pool.add_repo(arg) - if not firstrepo: - firstrepo = repo - if re.search(r'solv$', arg): + argf = solv.xfopen(arg) + repo = pool.add_repo(arg) + if not firstrepo: + firstrepo = repo + if re.search(r'solv$', arg): repo.add_solv(argf) - elif re.search(r'primary\.xml', arg): + elif re.search(r'primary\.xml', arg): repo.add_rpmmd(argf, None) - elif re.search(r'packages', arg): + elif re.search(r'packages', arg): repo.add_susetags(argf, 0, None) - else: - print("%s: unknown repo type" % (arg)) - sys.exit(1) + else: + print("%s: unknown repo type" % (arg)) + sys.exit(1) # we only want self-provides for p in pool.solvables: @@ -67,7 +67,7 @@ for p in firstrepo.solvables: continue if p.identical(pp): continue - if p.archid != pp.archid and p.archid != solv.ARCH_NOARCH and pp.archid != solv.ARCH_NOARCH: + if p.archid != pp.archid and p.archid != solv.ARCH_NOARCH and pp.archid != solv.ARCH_NOARCH: continue src = p.name if not p.lookup_void(solv.SOLVABLE_SOURCENAME): diff --git a/tests/__init__.py b/tests/__init__.py index 36a9c4c6..a22fcb2b 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- # # (C) 2014 tchvatal@suse.cz, openSUSE.org