* some cleanup concerning the error message at the end of the installation

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

4 files changed, 19 insertions, 275 deletions

diff --git a/installer/OpenSLX/OSSetup/Distro/Fedora_6.pm b/installer/OpenSLX/OSSetup/Distro/Fedora_6.pm
index 5a9ec151..2113ea99 100644
--- a/installer/OpenSLX/OSSetup/Distro/Fedora_6.pm
+++ b/installer/OpenSLX/OSSetup/Distro/Fedora_6.pm
@@ -162,7 +162,8 @@ sub initDistroInfo
 	";
 
 	$self->{config}->{'selection'} = {
-		'default' => "list any packagenames here",
+		'default' => "
+		",
 	}
 }
 
diff --git a/installer/OpenSLX/OSSetup/Distro/SUSE_10_1.pm b/installer/OpenSLX/OSSetup/Distro/SUSE_10_1.pm
index 41d164c6..8ce82296 100644
--- a/installer/OpenSLX/OSSetup/Distro/SUSE_10_1.pm
+++ b/installer/OpenSLX/OSSetup/Distro/SUSE_10_1.pm
@@ -160,271 +160,7 @@ sub initDistroInfo
 	";
 
 	$self->{config}->{'selection'} = {
-		'default' => "
-			AdobeICCProfiles
-			BEAJava2-JRE
-			MozillaFirefox
-			MozillaFirefox-translations
-			NX
-			NetworkManager
-			NetworkManager-kde
-			OpenEXR
-			OpenEXR-32bit
-			OpenOffice_org
-			OpenOffice_org-Quickstarter
-			OpenOffice_org-kde
-			RealPlayer
-			aalib
-			aalib-32bit
-			acroread
-			amarok
-			amarok-helix
-			amarok-libvisual
-			apparmor-docs
-			apparmor-parser
-			apparmor-profiles
-			apparmor-utils
-			aspell
-			aspell-32bit
-			aspell-en
-			atk
-			atk-32bit
-			audit
-			audit-libs
-			beagle-firefox
-			beagle-index
-			cairo
-			cairo-32bit
-			cdparanoia
-			cdparanoia-32bit
-			crafty
-			cyrus-sasl-crammd5
-			cyrus-sasl-digestmd5
-			cyrus-sasl-plain
-			dejavu
-			desktop-data-SuSE
-			desktop-file-utils
-			dhcdbd
-			dhcp-client
-			digikam
-			digikam-doc
-			digikamimageplugins
-			dirmngr
-			dragonegg
-			dvd+rw-tools
-			efont-unicode
-			enscript
-			fam
-			fam-32bit
-			fam-server
-			flac
-			flac-32bit
-			flash-player
-			gconf2
-			gconf2-32bit
-			ghostscript-library
-			gimp
-			gimp-cmyk
-			glitz
-			glitz-32bit
-			gnome-mime-data
-			gnome-vfs2
-			gnome-vfs2-32bit
-			gnutls
-			gnutls-32bit
-			goom2k4
-			gpgme
-			gtk-qt-engine
-			gtk-qt-engine-32bit
-			gtk2
-			gtk2-32bit
-			gwenview
-			htdig
-			imlib2
-			imlib2-loaders
-			jack
-			jack-32bit
-			java-1_4_2-sun
-			java-1_4_2-sun-plugin
-			jpackage-utils
-			k3b
-			kaffeine
-			kdeaddons3-kate
-			kdeaddons3-kicker
-			kdeaddons3-konqueror
-			kdeartwork3-kscreensaver
-			kdeartwork3-sound
-			kdeartwork3-xscreensaver
-			kdebase3
-			kdebase3-32bit
-			kdebase3-SuSE
-			kdebase3-kdm
-			kdebase3-ksysguardd
-			kdebase3-nsplugin
-			kdebase3-samba
-			kdebase3-session
-			kdebindings3-python
-			kdebluetooth
-			kdegames3
-			kdegraphics3
-			kdegraphics3-fax
-			kdegraphics3-kamera
-			kdegraphics3-pdf
-			kdegraphics3-postscript
-			kdegraphics3-scan
-			kdelibs3
-			kdelibs3-32bit
-			kdemultimedia3
-			kdemultimedia3-CD
-			kdemultimedia3-mixer
-			kdenetwork3
-			kdenetwork3-InstantMessenger
-			kdenetwork3-news
-			kdenetwork3-vnc
-			kdepim3
-			kdepim3-kpilot
-			kdepim3-networkstatus
-			kdepim3-sync
-			kdetv
-			kdeutils3
-			kdeutils3-laptop
-			kerry
-			kio_beagle
-			kio_ipodslave
-			kio_slp
-			kipi-plugins
-			knights
-			konversation
-			kphone
-			kpowersave
-			krecord
-			kscpm
-			ktorrent
-			libapparmor
-			libapr0
-			libart_lgpl
-			libart_lgpl-32bit
-			libbonobo
-			libbonobo-32bit
-			libcddb
-			libcddb-32bit
-			libcdio
-			libcdio-32bit
-			libexif
-			libexif-32bit
-			libgcc-mainline
-			libgimpprint
-			libgnome
-			libgnome-32bit
-			libgphoto2
-			libgphoto2-32bit
-			libid3tag
-			libidl
-			libidl-32bit
-			libidn
-			libidn-32bit
-			libieee1284
-			libieee1284-32bit
-			libjasper
-			libjasper-32bit
-			libjpeg
-			libjpeg-32bit
-			libksba
-			liblcms
-			liblcms-32bit
-			libmng
-			libmng-32bit
-			libmusicbrainz
-			libnl
-			libogg
-			libogg-32bit
-			libopencdk
-			libopencdk-32bit
-			libpcap
-			libpng
-			libpng-32bit
-			libsmbclient
-			libsmbclient-32bit
-			libsndfile
-			libsndfile-32bit
-			libstdc++-mainline
-			libtheora
-			libtheora-32bit
-			libtool
-			libtool-32bit
-			libtunepimp
-			libvisual
-			libvisual-plugins
-			libvorbis
-			libvorbis-32bit
-			lzo
-			lzo-32bit
-			mDNSResponder
-			mDNSResponder-32bit
-			mDNSResponder-lib
-			mDNSResponder-lib-32bit
-			mkisofs
-			mozilla-nspr
-			mozilla-nspr-32bit
-			mozilla-nss
-			mozilla-nss-32bit
-			myspell-american
-			myspell-british
-			neon
-			neon-32bit
-			net-snmp
-			nvidiagl
-			orbit2
-			orbit2-32bit
-			pango
-			pango-32bit
-			perl-Net-Daemon
-			perl-PDA-Pilot
-			perl-PlRPC
-			perl-TermReadKey
-			pilot-link
-			pinentry
-			ppp
-			preload
-			psutils
-			python
-			python-32bit
-			python-xml
-			qt3
-			qt3-32bit
-			rrdtool
-			samba
-			samba-32bit
-			sane
-			sane-32bit
-			sensors
-			slang
-			slang-32bit
-			speex
-			speex-32bit
-			sqlite
-			sqlite-32bit
-			sqlite2
-			sqlite2-32bit
-			startup-notification
-			startup-notification-32bit
-			susehelp
-			taglib
-			taglib-32bit
-			unixODBC
-			unixODBC-32bit
-			vcdimager
-			vcdimager-32bit
-			vorbis-tools
-			wvstreams
-			xine-internal
-			xine-lib
-			xine-lib-32bit
-			xorg-modular
-			xscreensaver
-			yast2-apparmor
-			zvbi
-",
+		'default' => "",
 	}
 }
 
diff --git a/installer/OpenSLX/OSSetup/Distro/SUSE_10_2_x86_64.pm b/installer/OpenSLX/OSSetup/Distro/SUSE_10_2_x86_64.pm
index 61e52cfd..b408cb17 100644
--- a/installer/OpenSLX/OSSetup/Distro/SUSE_10_2_x86_64.pm
+++ b/installer/OpenSLX/OSSetup/Distro/SUSE_10_2_x86_64.pm
@@ -164,8 +164,7 @@ sub initDistroInfo
 	";
 
 	$self->{config}->{'selection'} = {
-		'default' => "
-		",
+		'default' => "",
 	}
 }
 
diff --git a/installer/OpenSLX/OSSetup/Engine.pm b/installer/OpenSLX/OSSetup/Engine.pm
index ba8d826a..abab54c7 100644
--- a/installer/OpenSLX/OSSetup/Engine.pm
+++ b/installer/OpenSLX/OSSetup/Engine.pm
@@ -143,6 +143,8 @@ sub installVendorOS
 	}
 	$self->stage1C_cleanupBasicSystem();
 	$self->setupStage1D();
+	vlog 0, _tr("Vendor-OS <%s> installed succesfully.\n",
+				$self->{'vendor-os-name'});
 
 	$self->addInstalledVendorOSToConfigDB();
 }
@@ -152,6 +154,8 @@ sub updateVendorOS
 	my $self = shift;
 
 	$self->updateStage1D();
+	vlog 0, _tr("Vendor-OS <%s> updated succesfully.\n",
+				$self->{'vendor-os-name'});
 }
 
 sub addInstalledVendorOSToConfigDB
@@ -180,16 +184,16 @@ sub addInstalledVendorOSToConfigDB
 									  { 'name' => $vendorOSName },
 									  'id');
 		if (defined $vendorOS) {
-			print STDERR _tr("Vendor-OS <%s> already exists in OpenSLX-database!\n",
-							 $vendorOSName);
+			vlog 0, _tr("Vendor-OS <%s> already exists in OpenSLX-database!\n",
+						$vendorOSName);
 		} else {
 			my $id = addVendorOS($openslxDB, {
 				'name' => $vendorOSName,
 				'path' => $self->{'vendor-os-name'},
 			});
 
-			print STDERR _tr("Vendor-OS <%s> has been added to DB (ID=%s)\n",
-							 $vendorOSName, $id);
+			vlog 0, _tr("Vendor-OS <%s> has been added to DB (ID=%s).\n",
+						$vendorOSName, $id);
 		}
 
 		disconnectConfigDB($openslxDB);
@@ -620,10 +624,14 @@ sub stage1D_installPackageSelection
 	my $pkgSelection = $self->{'distro-info'}->{selection}->{$selectionName};
 	my @pkgs
 		= grep { length($_) > 0 }
-		  map { $_ =~ s[^\s*(.+?)\s*$][$1]; $_ }
+		  map { $_ =~ s[^\s*(.*?)\s*$][$1]; $_ }
 		  split "\n", $pkgSelection;
-	$self->{'meta-packager'}->installSelection(join " ", @pkgs);
-
+	if (scalar(@pkgs) == 0) {
+		vlog 0, _tr("No packages listed for selection <%s>, nothing to do.",
+					$selectionName);
+	} else {
+		$self->{'meta-packager'}->installSelection(join " ", @pkgs);
+	}
 }
 
 ################################################################################