X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=pkgs.py;h=84010db615f18e4c66cbb1f53b96a00b2068b6fd;hb=d655e39ed5f649c922761fa79200972ac08c77f3;hp=220eb74815f0b18b254aa3e7e64fdd537a4e2ec4;hpb=268dd7ffc933b0e8358afa8815787226f8aded5c;p=build.git

diff --git a/pkgs.py b/pkgs.py
index 220eb748..84010db6 100755
--- a/pkgs.py
+++ b/pkgs.py
@@ -32,9 +32,15 @@ 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',
+                    'sl6', 
+                    # debians
+                    'squeeze','wheezy',
+                    # ubuntus
+                    'oneiric', 'precise', 'quantal', 'raring' ]
 default_pldistro='onelab'
 
 known_keywords=['groupname', 'groupdesc', 
@@ -58,7 +64,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 +196,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 +218,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)