merged with SLE-12-SP5

yast · Sep 9, 2019 · a228e35 · a228e35
2 parents 617fb41 + 3780990
commit a228e35
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/package/yast2-services-manager.changes b/package/yast2-services-manager.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Sep  6 14:28:55 CEST 2019 - schubi@suse.de
+
+- Set BaseTargets::GRAPHICAL and Target::GRAPHICAL if package "xdm"
+  will be installed (instead of xorg-x11-server) (bsc#1140735).
+- 4.0.11
+
 -------------------------------------------------------------------
 Wed Dec  5 15:29:24 CET 2018 - schubi@suse.de
 

diff --git a/package/yast2-services-manager.spec b/package/yast2-services-manager.spec
@@ -24,7 +24,7 @@
 ######################################################################
 
 Name:           yast2-services-manager
-Version:        4.0.10
+Version:        4.0.11
 Release:        0
 BuildArch:      noarch
 

diff --git a/src/modules/services_manager_target.rb b/src/modules/services_manager_target.rb
@@ -125,7 +125,7 @@ def import profile
         # setting default_target due the defined environment
         self.default_target = (Installation.x11_setup_needed &&
           Arch.x11_setup_needed &&
-          Pkg.IsSelected("xorg-x11-server")) ? BaseTargets::GRAPHICAL : BaseTargets::MULTIUSER
+          Pkg.IsSelected("xdm")) ? BaseTargets::GRAPHICAL : BaseTargets::MULTIUSER
       else
         self.default_target = profile.target
       end

diff --git a/test/services_manager_test.rb b/test/services_manager_test.rb
@@ -169,7 +169,7 @@ module Yast
         it "setting to graphical if X11 is available" do
           expect(Installation).to receive(:x11_setup_needed).and_return(true)
           expect(Arch).to receive(:x11_setup_needed).and_return(true)
-          expect(Pkg).to receive(:IsSelected).with("xorg-x11-server").and_return(true)
+          expect(Pkg).to receive(:IsSelected).with("xdm").and_return(true)
           expect(ServicesManagerTarget).to receive(:import).and_call_original
           expect(ServicesManager.import({})).to eq(true)
           expect(ServicesManagerTarget.default_target).to eq("graphical")