X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=pkgs.py;h=0b95595575154ddc546e8720bbee753f0e6e7f07;hb=2d2f9a66f21de60619eabf65892bf799255bec86;hp=495369b22ec8b25fec4e8ec5e167381502e34fcb;hpb=f73d2ef444b30b1c21569bf424ea573fbcae0d80;p=build.git

diff --git a/pkgs.py b/pkgs.py
index 495369b2..0b955955 100755
--- a/pkgs.py
+++ b/pkgs.py
@@ -32,14 +32,23 @@ 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='f14'
+known_fcdistros = [ 'centos5','centos6',
+                    'f8', 'f10','f12', 'f14', 'f16', 'f18','f20','f21',
+                    'sl6', 
+                    # debians
+                    'squeeze','wheezy','jessie',
+                    # ubuntus
+                    'oneiric', 'precise', 'quantal', 'raring', 'saucy', 'trusty', 'utopic' ]
 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 +67,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
@@ -207,6 +221,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)