* reverted changeset 1347, as installPrerequiredPackages() *should* have been

  used (as installing the packages via installPackages() does not work
  for debian-based distros)

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1348 95ad53e4-c205-0410-b2fa-d234c58c8868

2 files changed, 21 insertions, 1 deletions

diff --git a/installer/OpenSLX/OSSetup/Packager/Base.pm b/installer/OpenSLX/OSSetup/Packager/Base.pm
index 55211183..c33b690b 100644
--- a/installer/OpenSLX/OSSetup/Packager/Base.pm
+++ b/installer/OpenSLX/OSSetup/Packager/Base.pm
@@ -49,6 +49,10 @@ sub importTrustedPackageKeys
 {
 }
 
+sub installPrerequiredPackages
+{
+}
+
 sub installPackages
 {
 }
diff --git a/installer/OpenSLX/OSSetup/Packager/rpm.pm b/installer/OpenSLX/OSSetup/Packager/rpm.pm
index d36b70d8..0fd502a0 100644
--- a/installer/OpenSLX/OSSetup/Packager/rpm.pm
+++ b/installer/OpenSLX/OSSetup/Packager/rpm.pm
@@ -65,13 +65,29 @@ 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 && @$pkgs;
+	return unless defined $pkgs && scalar(@$pkgs);
 
 	if (slxsystem("rpm", "--root=$finalPath", "-ivh", @$pkgs)) {
 		die _tr("error during package-installation (%s)\n", $!);