* renamed installSelection() and removeSelection() to ...Packages(), as that's

  what it is
* automatically replace newlines in packagelist by a space

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

1 files changed, 8 insertions, 6 deletions

diff --git a/installer/OpenSLX/OSSetup/MetaPackager/zypper.pm b/installer/OpenSLX/OSSetup/MetaPackager/zypper.pm
index 04554e70..9a732af0 100644
--- a/installer/OpenSLX/OSSetup/MetaPackager/zypper.pm
+++ b/installer/OpenSLX/OSSetup/MetaPackager/zypper.pm
@@ -65,23 +65,25 @@ sub setupPackageSource
 	return 1;
 }
 
-sub installSelection
+sub installPackages
 {
-	my $self         = shift;
-	my $pkgSelection = shift;
-	my $doRefresh    = shift || 0;
+	my $self      = shift;
+	my $packages  = shift;
+	my $doRefresh = shift || 0;
+
+	$packages =~ tr{\n}{ };
 
 	if ($doRefresh && slxsystem("zypper --non-interactive refresh")) {
 		die _tr("unable to update repo info (%s)\n", $!);
 	}
-	if (slxsystem("zypper --non-interactive install $pkgSelection")) {
+	if (slxsystem("zypper --non-interactive install $packages")) {
 		die _tr("unable to install selection (%s)\n", $!);
 	}
 
 	return 1;
 }
 
-sub removeSelection
+sub removePackages
 {
 	my $self         = shift;
 	my $pkgSelection = shift;