diff options
| author | Oliver Tappe | 2007-03-14 18:55:48 +0100 |
|---|---|---|
| committer | Oliver Tappe | 2007-03-14 18:55:48 +0100 |
| commit | 5234fd61b731214f8eff61ba31d9501971284d7e (patch) | |
| tree | 6b77100d156bb2ca5df21639ad59d9e7041a16d3 /installer/OpenSLX/OSSetup | |
| parent | * the splitting of vendor-os-name into distro-name and selection-name is now ... (diff) | |
| download | core-5234fd61b731214f8eff61ba31d9501971284d7e.tar.gz core-5234fd61b731214f8eff61ba31d9501971284d7e.tar.xz core-5234fd61b731214f8eff61ba31d9501971284d7e.zip | |
* cleanup
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@769 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'installer/OpenSLX/OSSetup')
| -rw-r--r-- | installer/OpenSLX/OSSetup/MetaPackager/Base.pm | 8 | ||||
| -rw-r--r-- | installer/OpenSLX/OSSetup/MetaPackager/yum.pm | 12 | ||||
| -rw-r--r-- | installer/OpenSLX/OSSetup/Packager/rpm.pm | 6 |
3 files changed, 19 insertions, 7 deletions
diff --git a/installer/OpenSLX/OSSetup/MetaPackager/Base.pm b/installer/OpenSLX/OSSetup/MetaPackager/Base.pm index 0baa1a84..b8e8e3e3 100644 --- a/installer/OpenSLX/OSSetup/MetaPackager/Base.pm +++ b/installer/OpenSLX/OSSetup/MetaPackager/Base.pm @@ -32,6 +32,14 @@ sub setupPackageSource { } +sub updateBasicVendorOS +{ +} + +sub installSelection +{ +} + 1; ################################################################################ diff --git a/installer/OpenSLX/OSSetup/MetaPackager/yum.pm b/installer/OpenSLX/OSSetup/MetaPackager/yum.pm index e2134e84..ca472074 100644 --- a/installer/OpenSLX/OSSetup/MetaPackager/yum.pm +++ b/installer/OpenSLX/OSSetup/MetaPackager/yum.pm @@ -54,17 +54,21 @@ sub setupPackageSource my $repoFile = "$self->{engine}->{'vendor-os-path'}/etc/yum.repos.d/$repoName.repo"; open(REPO, "> $repoFile") - or die _tr("unable to create repo-file <%s> (%s)", $repoFile, $1); + or die _tr("unable to create repo-file <%s> (%s)\n", $repoFile, $1); print REPO $repoDescr; close(REPO); } -sub updateBasicSystem +sub updateBasicVendorOS { my $self = shift; if (system("yum -y update")) { - die _tr("unable to update basic system (%s)", $!); + if ($! == 2) { + # file not found => yum isn't installed + die _tr("unable to update this vendor-os, as it seems to lack an installation of yum!\n"); + } + die _tr("unable to update this vendor-os (%s)\n", $!); } } @@ -74,7 +78,7 @@ sub installSelection my $pkgSelection = shift; if (system("yum -y install $pkgSelection")) { - die _tr("unable to install selection (%s)", $!); + die _tr("unable to install selection (%s)\n", $!); } system('rm /proc/cpuinfo'); } diff --git a/installer/OpenSLX/OSSetup/Packager/rpm.pm b/installer/OpenSLX/OSSetup/Packager/rpm.pm index 0e431b37..9956245a 100644 --- a/installer/OpenSLX/OSSetup/Packager/rpm.pm +++ b/installer/OpenSLX/OSSetup/Packager/rpm.pm @@ -54,7 +54,7 @@ sub importTrustedPackageKeys foreach my $keyFile (@$keyFiles) { vlog 2, "importing package key $keyFile..."; if (system("rpm", "--root=$finalPath", "--import", "$keyFile")) { - die _tr("unable to import package key <%s> (%s)", $keyFile, $!); + die _tr("unable to import package key <%s> (%s)\n", $keyFile, $!); } } } @@ -69,7 +69,7 @@ sub installPrerequiredPackages if (system("rpm", "--root=$finalPath", "-ivh", "--nodeps", "--noscripts", "--force", @$pkgs)) { - die _tr("error during prerequired-package-installation (%s)", $!); + die _tr("error during prerequired-package-installation (%s)\n", $!); } system("rm", "-rf", "$finalPath/var/lib/rpm"); } @@ -83,7 +83,7 @@ sub installPackages return unless defined $pkgs && scalar(@$pkgs); if (system("rpm", "--root=$finalPath", "-ivh", @$pkgs)) { - die _tr("error during package-installation (%s)", $!); + die _tr("error during package-installation (%s)\n", $!); } } |