X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.common;h=7a09d86f6266d7bf2ee2dfd5c0f42eae6ea629ee;hb=b15a92597a0c5fffb9d8179e02d996c745154dff;hp=268eaa7365d91a89b56f3fb67bfff178aaeb490a;hpb=b30d20ef9023e9f2799dd84a0472c4ddf84b5a18;p=build.git

diff --git a/build.common b/build.common
index 268eaa73..7a09d86f 100644
--- a/build.common
+++ b/build.common
@@ -20,12 +20,14 @@ function pl_getDistro() {
 	case $distro in Scientific*) distro="SL" ; esac
     elif [ -f /etc/lsb-release ] ; then
 	. /etc/lsb-release
-	echo $DISTRIB_CODENAME 
+	distro=$DISTRIB_CODENAME 
     elif [ -f /etc/debian_version ] ; then
 	case $(cat /etc/debian_version) in
 	    6.*) distro=squeeze ;;
-	    7.*)   distro=wheezy  ;;
-	    *)	   distro=unknown.debian.in.build.common ;;
+	    7.*) distro=wheezy  ;;
+	    # might be that I'm getting 'jessie'sid' just because it's still testing..
+	    8.*|jessie*) distro=jessie  ;;
+	    *)	 distro=unknown.debian.in.build.common ;;
 	esac
     fi
     [ -z "$distro" ] && { echo "build.common.pl_getDistro-unknown"; exit 1; }
@@ -64,7 +66,7 @@ function pl_getReleaseName () {
 	[Ss]L*)
 	    releasename=sl$release
 	    ;;
-	squeeze|wheezy|oneiric|precise|quantal|raring|saucy)
+	squeeze|wheezy|jessie|oneiric|precise|quantal|raring|saucy|trusty|utopic)
 	    releasename=$distro
 	    ;;
 	*)
@@ -571,6 +573,8 @@ function pl_parsePkgs () {
 # usage: pl_getPackages [-a arch] fcdistro pldistro pkg-file[..s]
 function pl_getPackages() { pl_parsePkgs package "$@" ; }
 function pl_getGroups() { pl_parsePkgs group "$@" ; }
+function pl_getPips() { pl_parsePkgs pip "$@" ; }
+function pl_getGems() { pl_parsePkgs gem "$@" ; }
 
 ##############################