* 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

6 files changed, 34 insertions, 26 deletions

diff --git a/installer/OpenSLX/OSSetup/Engine.pm b/installer/OpenSLX/OSSetup/Engine.pm
index 3a112d35..dd8d98d5 100644
--- a/installer/OpenSLX/OSSetup/Engine.pm
+++ b/installer/OpenSLX/OSSetup/Engine.pm
@@ -1643,7 +1643,7 @@ sub _stage1D_installPackageSelection
 	}
 	else {
 		vlog(1, "installing these packages:\n" . join("\n\t", @pkgs));
-		$self->{'meta-packager'}->installSelection(join(' ', @pkgs), 1);
+		$self->{'meta-packager'}->installPackages(join(' ', @pkgs), 1);
 	}
 	return;
 }
diff --git a/installer/OpenSLX/OSSetup/MetaPackager/Base.pm b/installer/OpenSLX/OSSetup/MetaPackager/Base.pm
index 91b2d087..517e9f9a 100644
--- a/installer/OpenSLX/OSSetup/MetaPackager/Base.pm
+++ b/installer/OpenSLX/OSSetup/MetaPackager/Base.pm
@@ -49,11 +49,11 @@ sub updateBasicVendorOS
 {
 }
 
-sub installSelection
+sub installPackages
 {
 }
 
-sub removeSelection
+sub removePackages
 {
 }
 
diff --git a/installer/OpenSLX/OSSetup/MetaPackager/apt.pm b/installer/OpenSLX/OSSetup/MetaPackager/apt.pm
index 137bab5e..a8a4f91e 100644
--- a/installer/OpenSLX/OSSetup/MetaPackager/apt.pm
+++ b/installer/OpenSLX/OSSetup/MetaPackager/apt.pm
@@ -88,11 +88,13 @@ sub setupPackageSource
 	return;
 }
 
-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("apt-get -y update")) {
 		die _tr("unable to update repository info (%s)\n", $!);
@@ -102,7 +104,7 @@ sub installSelection
 			= "'File{/var/cache/debconf/slx-defaults.dat}'";
 	}
 	$ENV{DEBIAN_FRONTEND} = 'noninteractive';
-	if (slxsystem("apt-get -y install $pkgSelection")) {
+	if (slxsystem("apt-get -y install $packages")) {
 		die _tr("unable to install selection (%s)\n", $!);
 	}
 	delete $ENV{DEBCONF_DB_FALLBACK};
@@ -111,7 +113,7 @@ sub installSelection
 	return 1;
 }
 
-sub removeSelection
+sub removePackages
 {
 	my $self         = shift;
 	my $pkgSelection = shift;
diff --git a/installer/OpenSLX/OSSetup/MetaPackager/smart.pm b/installer/OpenSLX/OSSetup/MetaPackager/smart.pm
index bc13d1ee..27995e01 100644
--- a/installer/OpenSLX/OSSetup/MetaPackager/smart.pm
+++ b/installer/OpenSLX/OSSetup/MetaPackager/smart.pm
@@ -82,22 +82,24 @@ 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("smart update")) {
 		die _tr("unable to update channel info (%s)\n", $!);
 	}
-	if (slxsystem("smart install -y $pkgSelection")) {
+	if (slxsystem("smart install -y $packages")) {
 		die _tr("unable to install selection (%s)\n", $!);
 	}
 	return 1;
 }
 
-sub removeSelection
+sub removePackages
 {
 	my $self         = shift;
 	my $pkgSelection = shift;
diff --git a/installer/OpenSLX/OSSetup/MetaPackager/yum.pm b/installer/OpenSLX/OSSetup/MetaPackager/yum.pm
index 7d2bc630..eef310fe 100644
--- a/installer/OpenSLX/OSSetup/MetaPackager/yum.pm
+++ b/installer/OpenSLX/OSSetup/MetaPackager/yum.pm
@@ -71,19 +71,21 @@ sub setupPackageSource
 	return 1;
 }
 
-sub installSelection
+sub installPackages
 {
-	my $self         = shift;
-	my $pkgSelection = shift;
+	my $self     = shift;
+	my $packages = shift;
+
+	$packages =~ tr{\n}{ };
 
-	if (slxsystem("yum -y install $pkgSelection")) {
+	if (slxsystem("yum -y install $packages")) {
 		die _tr("unable to install selection (%s)\n", $!);
 	}
 
 	return 1;
 }
 
-sub removeSelection
+sub removePackages
 {
 	my $self         = shift;
 	my $pkgSelection = shift;
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;