diff options
| author | Oliver Tappe | 2007-05-28 15:29:45 +0200 |
|---|---|---|
| committer | Oliver Tappe | 2007-05-28 15:29:45 +0200 |
| commit | d7afcd0a5a3d03251991bc7fc91ba14b38a92fc8 (patch) | |
| tree | c8bd01847af67ab915cd60abaa25183e56505157 /installer/OpenSLX/OSSetup/Engine.pm | |
| parent | * changed slxsystem to ignore SIGPIPE instead of exiting, as this used to cause (diff) | |
| download | core-d7afcd0a5a3d03251991bc7fc91ba14b38a92fc8.tar.gz core-d7afcd0a5a3d03251991bc7fc91ba14b38a92fc8.tar.xz core-d7afcd0a5a3d03251991bc7fc91ba14b38a92fc8.zip | |
* 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
Diffstat (limited to 'installer/OpenSLX/OSSetup/Engine.pm')
| -rw-r--r-- | installer/OpenSLX/OSSetup/Engine.pm | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/installer/OpenSLX/OSSetup/Engine.pm b/installer/OpenSLX/OSSetup/Engine.pm index d53cc6ab..da19ca7f 100644 --- a/installer/OpenSLX/OSSetup/Engine.pm +++ b/installer/OpenSLX/OSSetup/Engine.pm @@ -470,20 +470,6 @@ sub createMetaPackager $self->{'meta-packager'} = $metaPackager; } -sub selectBaseURL -{ - my $self = shift; - my $repoInfo = shift; - - my $baseURL = $repoInfo->{url}; - if (!defined $baseURL) { - my @baseURLs = string2Array($repoInfo->{urls}); - # TODO: insert a closest mirror algorithm here! - $baseURL = $baseURLs[0]; - } - return $baseURL; -} - sub sortRepositoryURLs { my $self = shift; @@ -530,7 +516,7 @@ try_next_url: } } if (!defined $foundFile) { - if ($tryCount < $maxTryCount) { + if (!$ENV{SLX_NO_MIRRORS} && $tryCount < $maxTryCount) { $tryCount++; $self->{'baseURL-index'} = ($self->{'baseURL-index'}+1) % scalar(@URLs); @@ -538,7 +524,7 @@ try_next_url: $URLs[$self->{'baseURL-index'}]); goto try_next_url; } - die _tr("unable to fetch '%s' from any mirrors!\n", + die _tr("unable to fetch '%s' from any source!\n", $fileVariantStr); } push @foundFiles, $foundFile; |