X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=pkgs.py;h=3087493efe2647dc7700d5094de31b9dd7adc771;hb=ccdbfde0e9cda749d790f901247f1c524177c951;hp=d4445f06ade3e6b246dd70bdaddccb2967548f66;hpb=4931f4001fb7ed440383ec48a14050e9529832d8;p=build.git

diff --git a/pkgs.py b/pkgs.py
index d4445f06..3087493e 100755
--- a/pkgs.py
+++ b/pkgs.py
@@ -35,14 +35,14 @@ from optparse import OptionParser
 import re
 
 default_arch = 'x86_64'
-known_arch = ['i386', 'i686', 'x86_64']
-default_fcdistro = 'f29'
+known_archs = ['i386', 'i686', 'x86_64']
+default_fcdistro = 'f31'
 known_fcdistros = [
     'centos5', 'centos6',
     # oldies but we have references to that in the pkgs files
     'f8', 'f10', 'f12', 'f14', 'f16', 'f18', 'f20', 'f21', 'f22', 'f23', 'f24',
     # these ones are still relevant
-    'f25', 'f27', 'f29',
+    'f25', 'f27', 'f29', 'f31',
     # scientific linux
     'sl6',
     # debians
@@ -50,6 +50,7 @@ known_fcdistros = [
     # ubuntus
     'trusty',  # 14.04 LTS
     'xenial',  # 16.04 LTS
+    'bionic',  # 18.04 LTS
 ]
 default_pldistro = 'onelab'
 
@@ -116,7 +117,7 @@ class PkgsParser:
     re_qualified += r'\s*'
     re_qualified += r'(?P<fcdistro>{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))
@@ -241,13 +242,13 @@ def main ():
         sys.exit(1)
     keyword = args[0]
     inputs = args[1:]
-    if not options.arch in known_arch:
+    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)