From 09ef75b19146a7bea164e52cbdd8be74bdf5cc29 Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Tue, 15 Jan 2013 19:17:10 +0100
Subject: [PATCH] more fixes for building on debian

---
 pkgs.py                | 14 +++++++++++---
 vbuild-init-vserver.sh |  3 ++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs.py b/pkgs.py
index 495369b2..74261db9 100755
--- a/pkgs.py
+++ b/pkgs.py
@@ -33,8 +33,11 @@ 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']
+default_fcdistro='f14'
+known_fcdistros = [ 'centos5','centos6',
+                    'f8', 'f10','f12', 'f14', 'f16', 'f17',
+                    'sl6', 
+                    'lenny','squeeze','wheezy','jessie' ]
 default_pldistro='onelab'
 
 known_keywords=['groupname', 'groupdesc', 
@@ -58,7 +61,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
diff --git a/vbuild-init-vserver.sh b/vbuild-init-vserver.sh
index 46703d97..70b900f7 100755
--- a/vbuild-init-vserver.sh
+++ b/vbuild-init-vserver.sh
@@ -323,7 +323,8 @@ function devel_or_vtest_tools () {
 	debootstrap)
 	    $personality vserver $vserver exec apt-get update
 	    for package in $packages ; do 
-		$personality vserver $vserver exec apt-get install -y $package 
+		$personality vserver $vserver exec apt-get install -y $package || \
+		    { echo "WARNING - missing package on debian $package - ignored" ; true; }
 	    done
 	    ### xxx todo install groups with apt..
 	    ;;
-- 
2.47.0