From a6c756e04be727448f4a0f7263294f16b1470b6d Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Wed, 17 Dec 2008 20:27:53 +0000
Subject: Repairing r2428, in reply to r2431 :)

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2432 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 VERSIONS                                           |  2 +-
 os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm  |  7 -------
 .../plugins/desktop/OpenSLX/OSPlugin/desktop.pm    | 23 ++++++++++++----------
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/VERSIONS b/VERSIONS
index c533e182..18b30d47 100644
--- a/VERSIONS
+++ b/VERSIONS
@@ -1,4 +1,4 @@
 OPENSLX_VERSION_MAJOR="4"
 OPENSLX_VERSION_MINOR="9"
-OPENSLX_VERSION_RELEASE="2"
+OPENSLX_VERSION_RELEASE="3"
 OPENSLX_VERSION_STRING="${OPENSLX_VERSION_MAJOR}.${OPENSLX_VERSION_MINOR}.${OPENSLX_VERSION_RELEASE}${OPENSLX_SVN_SNAPSHOT:+rev$OPENSLX_VERSION_SVNREV}"
diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm
index 54ecd8b9..9184733f 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm
@@ -61,13 +61,6 @@ sub getDefaultDesktopKind
         : isPackInstalled('startxfce') ? 'xfce' : undef;
 }
 
-sub isGDMInstalled 		{ return isPackInstalled('gdm');}
-sub isKDMInstalled 		{ return isPackInstalled('kdm');}
-sub isXDMInstalled 		{ return isPackInstalled('xdm');}
-sub isGNOMEInstalled 	{ return isPackInstalled('gnome-session');}
-sub isKDEInstalled 		{ return isPackInstalled('startkde');}
-sub isXFCEInstalled 	{ return isPackInstalled('startxfce');}
-
 sub installGNOME
 {
     my $self = shift;
diff --git a/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm b/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm
index bd1d607b..70dbb56f 100644
--- a/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm
@@ -433,22 +433,25 @@ sub _installRequiredPackages
 
     my $engine = $self->{'os-plugin-engine'};
     
-    if ($self->{'gnome'} && !$self->{distro}->isGNOMEInstalled()) {
-        $self->{distro}->installGNOME();
+    if ($self->{'gnome'} && 
+        !$self->{distro}->isPackInstalled('gnome-session')) {
+             $self->{distro}->installGNOME();
     }
-    if ($self->{'gdm'} && !$self->{distro}->isGDMInstalled()) {
-        $self->{distro}->installGDM();
+    if ($self->{'gdm'} && !$self->{distro}->isPackInstalled('gdm')) {
+             $self->{distro}->installGDM();
     }
-    if ($self->{'kde'} && !$self->{distro}->isKDEInstalled()) {
-        $self->{distro}->installKDE();
+    if ($self->{'kde'} &&
+        !$self->{distro}->isPackInstalled('startkde')) {
+             $self->{distro}->installKDE();
     }
-    if ($self->{'kdm'} && !$self->{distro}->isKDMInstalled()) {
+    if ($self->{'kdm'} && !$self->{distro}->isPackInstalled('kdm')) {
         $self->{distro}->installKDM();
     }
-    if ($self->{'xfce'} && !$self->{distro}->isXFCEInstalled()) {
-        $self->{distro}->installXFCE();
+    if ($self->{'xfce'} && 
+        !$self->{distro}->isPackInstalled('startxfce')) {
+             $self->{distro}->installXFCE();
     }
-    if ($self->{'xdm'} && !$self->{distro}->isXDMInstalled()) {
+    if ($self->{'xdm'} && !$self->{distro}->isPackInstalled('xdm')) {
         $self->{distro}->installXDM();
     }
 
-- 
cgit v1.2.3-55-g7522