* improved reliability in case of user interrupts

* added support for specifying excludes, doesn't work properly yet, though


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

5 files changed, 20 insertions, 21 deletions

diff --git a/installer/OpenSLX/OSSetup/Distro/Base.pm b/installer/OpenSLX/OSSetup/Distro/Base.pm
index cb2ac57c..7d63e049 100644
--- a/installer/OpenSLX/OSSetup/Distro/Base.pm
+++ b/installer/OpenSLX/OSSetup/Distro/Base.pm
@@ -122,6 +122,10 @@ sub startSession
 {
 }
 
+sub updateDistroConfig
+{
+}
+
 sub finishSession
 {
 }
diff --git a/installer/OpenSLX/OSSetup/Distro/SUSE_10_1.pm b/installer/OpenSLX/OSSetup/Distro/SUSE_10_1.pm
index 3d5f8a09..d9fa78f6 100644
--- a/installer/OpenSLX/OSSetup/Distro/SUSE_10_1.pm
+++ b/installer/OpenSLX/OSSetup/Distro/SUSE_10_1.pm
@@ -55,7 +55,7 @@ sub fixPrerequiredFiles
 	}
 }
 
-sub finishSession
+sub updateDistroConfig
 {
 	my $self = shift;
 
@@ -67,7 +67,6 @@ sub finishSession
 	if (slxsystem("SuSEconfig")) {
 		die _tr("unable to run SuSEconfig (%s)", $!);
 	}
-	$self->SUPER::finishSession();
 }
 
 sub initDistroInfo
diff --git a/installer/OpenSLX/OSSetup/Distro/SUSE_10_1_x86_64.pm b/installer/OpenSLX/OSSetup/Distro/SUSE_10_1_x86_64.pm
index 7520cddd..fd74f4cd 100644
--- a/installer/OpenSLX/OSSetup/Distro/SUSE_10_1_x86_64.pm
+++ b/installer/OpenSLX/OSSetup/Distro/SUSE_10_1_x86_64.pm
@@ -55,7 +55,7 @@ sub fixPrerequiredFiles
 	}
 }
 
-sub finishSession
+sub updateDistroConfig
 {
 	my $self = shift;
 
@@ -67,7 +67,6 @@ sub finishSession
 	if (slxsystem("SuSEconfig")) {
 		die _tr("unable to run SuSEconfig (%s)", $!);
 	}
-	$self->SUPER::finishSession();
 }
 
 sub initDistroInfo
diff --git a/installer/OpenSLX/OSSetup/Distro/SUSE_10_2.pm b/installer/OpenSLX/OSSetup/Distro/SUSE_10_2.pm
index 28da0584..f67a8fba 100644
--- a/installer/OpenSLX/OSSetup/Distro/SUSE_10_2.pm
+++ b/installer/OpenSLX/OSSetup/Distro/SUSE_10_2.pm
@@ -55,7 +55,7 @@ sub fixPrerequiredFiles
 	}
 }
 
-sub finishSession
+sub updateDistroConfig
 {
 	my $self = shift;
 
@@ -67,7 +67,6 @@ sub finishSession
 	if (slxsystem("SuSEconfig")) {
 		die _tr("unable to run SuSEconfig (%s)", $!);
 	}
-	$self->SUPER::finishSession();
 }
 
 sub initDistroInfo
@@ -238,9 +237,6 @@ sub initDistroInfo
 			autoyast2-installation
 			bash
 			bc
-			beagle
-			beagle-firefox
-			beagle-index
 			bind-libs
 			bind-utils
 			binutils
@@ -442,7 +438,6 @@ sub initDistroInfo
 			kdeartwork3-kscreensaver
 			kdeartwork3-xscreensaver
 			kdebase3
-			kdebase3-beagle
 			kdebase3-kdm
 			kdebase3-ksysguardd
 			kdebase3-nsplugin
@@ -472,8 +467,6 @@ sub initDistroInfo
 			kdetv
 			kdeutils3
 			kernel-default
-			kerry
-			kio_beagle
 			kio_ipodslave
 			kio_iso
 			kio_slp
@@ -672,10 +665,7 @@ sub initDistroInfo
 			openssl
 			opensuse-manual_de
 			opensuse-manual_en
-			opensuse-quickstart_de
-			opensuse-quickstart_en
 			openSUSE-release
-			opensuse-updater
 			orbit2
 			pam
 			pam-config
@@ -759,7 +749,6 @@ sub initDistroInfo
 			rrdtool
 			rsync
 			ruby
-			rug
 			sane
 			sane-frontends
 			sash
@@ -952,16 +941,25 @@ sub initDistroInfo
 			yast2-xml
 			ypbind
 			yp-tools
-			zen-updater
 			zip
 			zisofs-tools
 			zlib
-			zmd
 			zsh
 			zvbi
-			zypper
 		",
 	};
+
+	$self->{config}->{'excludes'} = {
+		# these packages will never be installed:
+	    
+		'default' => "
+		",
+
+		'kde' => "
+			<<<default>>>
+		",
+	};
+
 }
 
 1;
\ No newline at end of file
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 2885b38b..9df9f855 100644
--- a/installer/OpenSLX/OSSetup/Distro/SUSE_10_2_x86_64.pm
+++ b/installer/OpenSLX/OSSetup/Distro/SUSE_10_2_x86_64.pm
@@ -55,7 +55,7 @@ sub fixPrerequiredFiles
 	}
 }
 
-sub finishSession
+sub updateDistroConfig
 {
 	my $self = shift;
 
@@ -67,7 +67,6 @@ sub finishSession
 	if (slxsystem("SuSEconfig")) {
 		die _tr("unable to run SuSEconfig (%s)", $!);
 	}
-	$self->SUPER::finishSession();
 }
 
 sub initDistroInfo