summaryrefslogtreecommitdiffstats
path: root/installer
diff options
context:
space:
mode:
authorOliver Tappe2007-09-24 10:13:57 +0200
committerOliver Tappe2007-09-24 10:13:57 +0200
commit096344ab176b8f4f899b9bea7f980dc243cc2865 (patch)
tree96802b1639413270cd6ff2c8db4c8ec749586ed4 /installer
parentAdded the 64bit busybox binary (both busyboxes are compiled on Debian Sarge s... (diff)
downloadcore-096344ab176b8f4f899b9bea7f980dc243cc2865.tar.gz
core-096344ab176b8f4f899b9bea7f980dc243cc2865.tar.xz
core-096344ab176b8f4f899b9bea7f980dc243cc2865.zip
* removed installPrerequiredPackages(), as it is no longer used
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1347 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'installer')
-rw-r--r--installer/OpenSLX/OSSetup/Packager/Base.pm4
-rw-r--r--installer/OpenSLX/OSSetup/Packager/rpm.pm18
2 files changed, 1 insertions, 21 deletions
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", $!);