X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=pkgs.py;h=3087493efe2647dc7700d5094de31b9dd7adc771;hb=ccdbfde0e9cda749d790f901247f1c524177c951;hp=e8e867bd0d6394f5f57a0f8497aa5df5b2eb1a12;hpb=d09caeb6feaba80058544610a250263e73d7b511;p=build.git diff --git a/pkgs.py b/pkgs.py index e8e867bd..3087493e 100755 --- a/pkgs.py +++ b/pkgs.py @@ -117,7 +117,7 @@ class PkgsParser: re_qualified += r'\s*' re_qualified += r'(?P{re_ident}[0-9]+)'.format(re_ident=re_ident) re_qualified += r'\s*' - m_qualified = re.compile(r'\A{}\Z'.format(re_qualified)) + m_qualified = re.compile(r'\A{re_qualified}\Z'.format(re_qualified=re_qualified)) re_old = '[a-z]+[+-][a-z]+[0-9]+' m_old = re.compile(r'\A{}\Z'.format(re_old)) @@ -242,13 +242,13 @@ def main (): sys.exit(1) keyword = args[0] inputs = args[1:] - if not options.arch in known_archs: + if options.arch not in known_archs: print('Unsupported arch', options.arch, file=stderr) parser.print_help(file=stderr) sys.exit(1) if options.arch == 'i686': options.arch = 'i386' - if not options.fcdistro in known_fcdistros: + if options.fcdistro not in known_fcdistros: print('Unsupported fcdistro', options.fcdistro, file=stderr) parser.print_help(file=stderr) sys.exit(1)