add forthcoming ubuntu (wily) and cleanup older fcdistros on all 3 accounts (fedora...

[build.git] / pkgs.py

diff --git a/pkgs.py b/pkgs.py
index 220eb74..0ba73cf 100755 (executable)
--- a/pkgs.py
+++ b/pkgs.py
@@ -32,14 +32,29 @@ from optparse import OptionParser
 import re
 
 default_arch='x86_64'
-known_arch = ['i386','x86_64']
-default_fcdistro='f12'
-known_fcdistros = [ 'centos5','centos6','f8', 'f9','f10','f11','f12', 'f13', 'f14', 'f16', 'sl6']
+known_arch = ['i386', 'i686', 'x86_64']
+default_fcdistro = 'f22'
+known_fcdistros = [
+    'centos5', 'centos6',
+    'f14', 'f18', 'f20', 'f21', 'f22',
+    'sl6', 
+    # debians
+    'wheezy','jessie',
+    # ubuntus
+    'precise', # 12.04 LTS
+    'trusty',  # 14.04 LTS
+    'utopic',  # 14.10
+    'vivid',   # 15.04
+    'wily',    # 15.10
+]
 default_pldistro='onelab'
 
-known_keywords=['groupname', 'groupdesc', 
-                'nodeyumexclude', 'plcyumexclude', 
-                'yumexclude', 'package', 'group', 'precious', 'junk', 'mirror', ]
+known_keywords = [
+    'group', 'groupname', 'groupdesc', 
+     'package', 'pip', 'gem', 
+    'nodeyumexclude', 'plcyumexclude', 'yumexclude',
+    'precious', 'junk', 'mirror',
+]
 
 
 m_fcdistro_cutter = re.compile('([a-z]+)([0-9]+)')
@@ -58,7 +73,12 @@ class PkgsParser:
         ok=False
         for known in known_fcdistros:
             if fcdistro == known:
-                (distro,version)=m_fcdistro_cutter.match(fcdistro).groups()
+                try:
+                    (distro,version)=m_fcdistro_cutter.match(fcdistro).groups()
+                # debian-like names can't use numbering
+                except:
+                    distro=fcdistro
+                    version=0
                 ok=True
         if ok:
             self.distro=distro
@@ -185,7 +205,7 @@ def main ():
     usage="Usage: %prog [options] keyword input[...]"
     parser=OptionParser (usage=usage)
     parser.add_option ('-a','--arch',dest='arch',action='store',default=default_arch,
-                       help='target arch, e.g. i386 or x86_64')
+                       help='target arch, e.g. i386 or x86_64, default=%s'%default_arch)
     parser.add_option ('-f','--fcdistro',dest='fcdistro',action='store', default=default_fcdistro,
                        help='fcdistro, e.g. f12 or centos5')
     parser.add_option ('-d','--pldistro',dest='pldistro',action='store', default=default_pldistro,
@@ -207,6 +227,7 @@ def main ():
         print >> stderr, 'Unsupported arch',options.arch
         parser.print_help(file=stderr)
         sys.exit(1)
+    if options.arch == 'i686': options.arch='i386'
     if not options.fcdistro in known_fcdistros:
         print >> stderr, 'Unsupported fcdistro',options.fcdistro
         parser.print_help(file=stderr)