From 096344ab176b8f4f899b9bea7f980dc243cc2865 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Mon, 24 Sep 2007 08:13:57 +0000 Subject: * removed installPrerequiredPackages(), as it is no longer used git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1347 95ad53e4-c205-0410-b2fa-d234c58c8868 --- installer/OpenSLX/OSSetup/Packager/Base.pm | 4 ---- installer/OpenSLX/OSSetup/Packager/rpm.pm | 18 +----------------- 2 files changed, 1 insertion(+), 21 deletions(-) (limited to 'installer') diff --git a/installer/OpenSLX/OSSetup/Packager/Base.pm b/installer/OpenSLX/OSSetup/Packager/Base.pm index c33b690b..55211183 100644 --- a/installer/OpenSLX/OSSetup/Packager/Base.pm +++ b/installer/OpenSLX/OSSetup/Packager/Base.pm @@ -49,10 +49,6 @@ sub importTrustedPackageKeys { } -sub installPrerequiredPackages -{ -} - sub installPackages { } diff --git a/installer/OpenSLX/OSSetup/Packager/rpm.pm b/installer/OpenSLX/OSSetup/Packager/rpm.pm index 0fd502a0..d36b70d8 100644 --- a/installer/OpenSLX/OSSetup/Packager/rpm.pm +++ b/installer/OpenSLX/OSSetup/Packager/rpm.pm @@ -65,29 +65,13 @@ sub importTrustedPackageKeys return; } -sub installPrerequiredPackages -{ - my $self = shift; - my $pkgs = shift; - my $finalPath = shift; - - return unless defined $pkgs && scalar(@$pkgs); - - if (slxsystem("rpm", "--root=$finalPath", "-ivh", "--nodeps", "--noscripts", - "--force", @$pkgs)) { - die _tr("error during prerequired-package-installation (%s)\n", $!); - } - slxsystem("rm", "-rf", "$finalPath/var/lib/rpm"); - return; -} - sub installPackages { my $self = shift; my $pkgs = shift; my $finalPath = shift; - return unless defined $pkgs && scalar(@$pkgs); + return unless defined $pkgs && @$pkgs; if (slxsystem("rpm", "--root=$finalPath", "-ivh", @$pkgs)) { die _tr("error during package-installation (%s)\n", $!); -- cgit v1.2.3-55-g7522