From a77503de708667b24d864c11e17203e266bc3a98 Mon Sep 17 00:00:00 2001 From: Raymond Mancy Date: Jul 08 2011 07:19:15 +0000 Subject: Merge "rhts_post snipped for adding Distro repo has bugs" into develop --- diff --git a/LabController/snippets/rhts_post b/LabController/snippets/rhts_post index 541dd85..889e567 100644 --- a/LabController/snippets/rhts_post +++ b/LabController/snippets/rhts_post @@ -60,9 +60,17 @@ popd #end if # Add Distro Repos -#if $getVar('tree_repos','') != '' +#set $tree_repos = $getVar('tree_repos','') +#if $tree_repos != '' +#if $tree_repos.find("http://") != -1 +#set $split = "|" +#set $base = "" +#else +#set $split = ":" +#set $base = "http://$server/distros" +#end if #set $i = 0 -#for $repo in $getVar('tree_repos','').split(':') +#for $repo in $getVar('tree_repos','').split($split) #set $i = $i + 1 #if $repo.find(",") != -1 #set (reponame, repourl) = $repo.split(',',1) @@ -73,7 +81,7 @@ popd cat << EOF > /etc/yum.repos.d/${reponame}.repo [$reponame] name=$reponame -baseurl=http://$server/distros$repourl +baseurl=$base$repourl enabled=1 gpgcheck=0 skip_if_unavailable=1