diff options
| author | Oliver Tappe | 2007-07-07 00:06:48 +0200 |
|---|---|---|
| committer | Oliver Tappe | 2007-07-07 00:06:48 +0200 |
| commit | 9686826b957a513a861edbdb3c3e3373401747b8 (patch) | |
| tree | d4e7b28c4405506e814ddbd722e467e894fad272 /installer/OpenSLX/OSSetup/MetaPackager | |
| parent | * modified default selection to (roughly) match the SUSE textmode installation (diff) | |
| download | core-9686826b957a513a861edbdb3c3e3373401747b8.tar.gz core-9686826b957a513a861edbdb3c3e3373401747b8.tar.xz core-9686826b957a513a861edbdb3c3e3373401747b8.zip | |
* revitalised local URLs
* simplified format of local URLs to consist of only a path
* adjusted meta-packagers to use mirrors only in case of non-local URLs
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1232 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'installer/OpenSLX/OSSetup/MetaPackager')
| -rw-r--r-- | installer/OpenSLX/OSSetup/MetaPackager/smart.pm | 3 | ||||
| -rw-r--r-- | installer/OpenSLX/OSSetup/MetaPackager/yum.pm | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/installer/OpenSLX/OSSetup/MetaPackager/smart.pm b/installer/OpenSLX/OSSetup/MetaPackager/smart.pm index 6e411a89..64773d17 100644 --- a/installer/OpenSLX/OSSetup/MetaPackager/smart.pm +++ b/installer/OpenSLX/OSSetup/MetaPackager/smart.pm @@ -72,7 +72,8 @@ sub setupPackageSource if (slxsystem("smart channel -y --add $repoDescr")) { die _tr("unable to add channel '%s' (%s)\n", $repoName, $!); } - unless ($ENV{SLX_NO_MIRRORS}) { + my $avoidMirrors = $repoInfo->{'avoid-mirrors'} || 0; + unless ($ENV{SLX_NO_MIRRORS} || $avoidMirrors) { my $mirrorDescr; foreach my $mirrorURL (@$repoURLs) { $mirrorDescr .= " --add $baseURL$repoSubdir $mirrorURL$repoSubdir"; diff --git a/installer/OpenSLX/OSSetup/MetaPackager/yum.pm b/installer/OpenSLX/OSSetup/MetaPackager/yum.pm index a1d2fa42..6dfe9523 100644 --- a/installer/OpenSLX/OSSetup/MetaPackager/yum.pm +++ b/installer/OpenSLX/OSSetup/MetaPackager/yum.pm @@ -66,7 +66,8 @@ sub setupPackageSource my $repoDescr = "[$repoName]\nname=$repoInfo->{name}\nbaseurl=$baseURL$repoSubdir\n"; - unless ($ENV{SLX_NO_MIRRORS}) { + my $avoidMirrors = $repoInfo->{'avoid-mirrors'} || 0; + unless ($ENV{SLX_NO_MIRRORS} || $avoidMirrors) { foreach my $mirrorURL (@$repoURLs) { $repoDescr .= " $mirrorURL$repoSubdir\n"; } |