* integrated mirror support into yum & smart backend

* fixed smart backend with respect to being restarted (it no longer stops,
  waiting for you to enter an alternative name for any existing channel)
* the use of mirrors can now be deactivated with SLX_NO_MIRROR=1, very
  useful for development


git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1095 95ad53e4-c205-0410-b2fa-d234c58c8868

1 files changed, 12 insertions, 3 deletions

diff --git a/installer/OpenSLX/OSSetup/MetaPackager/yum.pm b/installer/OpenSLX/OSSetup/MetaPackager/yum.pm
index acdb470d..6be391f0 100644
--- a/installer/OpenSLX/OSSetup/MetaPackager/yum.pm
+++ b/installer/OpenSLX/OSSetup/MetaPackager/yum.pm
@@ -58,11 +58,20 @@ sub setupPackageSource
 	my $repoInfo = shift;
 	my $excludeList = shift;
 
-	my $repoURL = $self->{engine}->selectBaseURL($repoInfo);
+	my $repoSubdir;
 	if (length($repoInfo->{'repo-subdir'})) {
-		$repoURL .= "/$repoInfo->{'repo-subdir'}";
+		$repoSubdir = "/$repoInfo->{'repo-subdir'}";
+	}
+	my $repoURLs = $self->{engine}->sortRepositoryURLs($repoInfo);
+	my $baseURL = shift @$repoURLs;
+
+	my $repoDescr 
+		= "[$repoName]\nname=$repoInfo->{name}\nbaseurl=$baseURL$repoSubdir\n";
+	unless ($ENV{SLX_NO_MIRRORS}) {
+		foreach my $mirrorURL (@$repoURLs) {
+			$repoDescr .= "        $mirrorURL$repoSubdir\n";
+		}
 	}
-	my $repoDescr = "[$repoName]\nname=$repoInfo->{name}\nbaseurl=$repoURL\n";
 	my $repoFile = "/etc/yum.repos.d/$repoName.repo";
 	open(REPO, "> $repoFile")
 		or die _tr("unable to create repo-file <%s> (%s)\n", $repoFile, $1);