diff options
| author | Sebastian Schmelzer | 2009-05-12 14:14:18 +0200 |
|---|---|---|
| committer | Sebastian Schmelzer | 2009-05-12 14:14:18 +0200 |
| commit | 4047e52beb10ff604d1564bfc29e7672aac87b8c (patch) | |
| tree | 45fc379629d0b1eb7754ae30c2997e7283bc6dd3 /installer/OpenSLX/OSSetup/MetaPackager | |
| parent | link after config is written, else problem with writing config (diff) | |
| download | core-4047e52beb10ff604d1564bfc29e7672aac87b8c.tar.gz core-4047e52beb10ff604d1564bfc29e7672aac87b8c.tar.xz core-4047e52beb10ff604d1564bfc29e7672aac87b8c.zip | |
remove old busybox stuff
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2851 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'installer/OpenSLX/OSSetup/MetaPackager')
| -rw-r--r-- | installer/OpenSLX/OSSetup/MetaPackager/zypper.pm | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/installer/OpenSLX/OSSetup/MetaPackager/zypper.pm b/installer/OpenSLX/OSSetup/MetaPackager/zypper.pm index 805c9ea0..4bb22bde 100644 --- a/installer/OpenSLX/OSSetup/MetaPackager/zypper.pm +++ b/installer/OpenSLX/OSSetup/MetaPackager/zypper.pm @@ -54,10 +54,19 @@ sub setupPackageSource my $repoURLs = shift; my $repoSubdir = ''; - if (length($repoInfo->{'repo-subdir'})) { + if (defined $repoInfo->{'repo-subdir'} && + length($repoInfo->{'repo-subdir'})) { $repoSubdir = "/$repoInfo->{'repo-subdir'}"; } my $baseURL = shift @$repoURLs; + + if ($baseURL =~ m/non-oss/) { + # skip non-oss repositories, cause zypper can't realy handle them + # correctly; zypper is deacting them with following message: + # "Repository type can't be determined." + return 1; + } + if (slxsystem("zypper addrepo $baseURL$repoSubdir $repoName")) { die _tr("unable to add repo '%s' (%s)\n", $repoName, $!); } |