Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package yast2-installation for
openSUSE:Factory checked in at 2021-05-20 19:24:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old)
and /work/SRC/openSUSE:Factory/.yast2-installation.new.2988 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-installation"
Thu May 20 19:24:43 2021 rev:470 rq:894091 version:4.4.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes
2021-05-12 19:31:48.775138094 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-installation.new.2988/yast2-installation.changes
2021-05-20 19:25:03.053944820 +0200
@@ -1,0 +2,7 @@
+Tue May 18 12:39:25 UTC 2021 - Knut Anderssen <kanders...@suse.com>
+
+- Fallback to ncurses when a X display is not opened after 15
+ seconds (bsc#1185095)
+- 4.4.7
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-4.4.6.tar.bz2
New:
----
yast2-installation-4.4.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.dBmpNO/_old 2021-05-20 19:25:03.597942589 +0200
+++ /var/tmp/diff_new_pack.dBmpNO/_new 2021-05-20 19:25:03.597942589 +0200
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 4.4.6
+Version: 4.4.7
Release: 0
Summary: YaST2 - Installation Parts
License: GPL-2.0-only
++++++ yast2-installation-4.4.6.tar.bz2 -> yast2-installation-4.4.7.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-4.4.6/package/yast2-installation.changes
new/yast2-installation-4.4.7/package/yast2-installation.changes
--- old/yast2-installation-4.4.6/package/yast2-installation.changes
2021-05-09 21:52:22.000000000 +0200
+++ new/yast2-installation-4.4.7/package/yast2-installation.changes
2021-05-18 17:00:33.000000000 +0200
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue May 18 12:39:25 UTC 2021 - Knut Anderssen <kanders...@suse.com>
+
+- Fallback to ncurses when a X display is not opened after 15
+ seconds (bsc#1185095)
+- 4.4.7
+
+-------------------------------------------------------------------
Thu Apr 29 15:59:52 UTC 2021 - Martin Vidner <mvid...@suse.com>
- Allow memory profiling of the main installer process, via
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-4.4.6/package/yast2-installation.spec
new/yast2-installation-4.4.7/package/yast2-installation.spec
--- old/yast2-installation-4.4.6/package/yast2-installation.spec
2021-05-09 21:52:22.000000000 +0200
+++ new/yast2-installation-4.4.7/package/yast2-installation.spec
2021-05-18 17:00:33.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 4.4.6
+Version: 4.4.7
Release: 0
Summary: YaST2 - Installation Parts
License: GPL-2.0-only
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-4.4.6/startup/YaST2.call
new/yast2-installation-4.4.7/startup/YaST2.call
--- old/yast2-installation-4.4.6/startup/YaST2.call 2021-05-09
21:52:22.000000000 +0200
+++ new/yast2-installation-4.4.7/startup/YaST2.call 2021-05-18
17:00:33.000000000 +0200
@@ -37,6 +37,9 @@
# the server is ready for requests using this function
# ---
server_running=0
+ # Accepts a max number of attempts to connect to the X-Server. In case
that the number is
+ # reached the X-Server will be killed. By default it tries forever.
(bsc#1185095)
+ open_display_attempts="${1:-0}"
TESTX=/usr/lib/YaST2/bin/testX
while kill -0 $xserver_pid 2>/dev/null ; do
sleep 1
@@ -47,6 +50,12 @@
if test $err = 1;then
log "\tTestX: XOpenDisplay failed"
server_running=0
+ ((open_display_attempts-=1))
+ if [ "$open_display_attempts" = 0 ];then
+ log "\tXOpenDisplay failed too many
times (killing XServer)"
+ kill_xserver
+ break
+ fi
continue
fi
# server is running, detach oom-killer from it
@@ -78,7 +87,8 @@
export DISPLAY=:0
Xorg -noreset -br -nolisten tcp -deferglyphs 16 2>/dev/tty8
1>&2 vt07 &
xserver_pid=$!
- wait_for_x11
+ # wait 15 seconds for the X-Server before killing it.
+ wait_for_x11 15
if [ "$server_running" = 1 ];then
log "\tX-Server is ready: $xserver_pid"
fi
@@ -186,6 +196,17 @@
set_inst_qt_env
}
+#----[ kill_xserver ]----#
+function kill_xserver () {
+ if [ -n "$xserver_pid" ];then
+ sleep 1 && kill $xserver_pid
+ while kill -0 $xserver_pid 2>/dev/null ; do
+ sleep 1
+ done
+ unset xserver_pid
+ fi
+}
+
#----[ check_x11 ]----#
function check_x11 () {
#------------------------------------------------------
@@ -532,8 +553,10 @@
log "\tMemory requirement > $MEM_NEEDED not fulfilled -> Medium Qt
disabled"
MEDIUM[0]=0
fi
+
# 3.1.4) Check if we need to start our own X11 server...
if [ -z "$DISPLAY" ];then
+ log "\tX-Server is needed"
NEED_XSERVER=1
fi
@@ -709,10 +732,7 @@
# 9.2) kill X-Server...
if [ "$server_running" = 1 ];then
- sleep 1 && kill $xserver_pid
- while kill -0 $xserver_pid 2>/dev/null ; do
- sleep 1
- done
+ kill_xserver
fi
if [ -s /etc/yast.inf ];then
