Accepting request 793973 from home:xiaoguang_wang:branches:GNOME:Factory

- Add gnome-session-error-numbers-wrong.patch: Remove erron in log
  'gnome-session-c[4905]: Error creating FIFO: File exists'
  (bsc#1169165 glgo!GNOME/gnome-session#42).

OBS-URL: https://build.opensuse.org/request/show/793973
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-session?expand=0&rev=318
This commit is contained in:
Dominique Leuenberger 2020-04-15 18:18:02 +00:00 committed by Git OBS Bridge
parent d7443983a1
commit c3ef10c658
3 changed files with 54 additions and 0 deletions

View File

@ -0,0 +1,44 @@
From 534850d20b4f9dcb2c521bf6420a4d34123e7893 Mon Sep 17 00:00:00 2001
From: Xiaoguang Wang <xwang@suse.com>
Date: Fri, 10 Apr 2020 15:41:23 +0800
Subject: [PATCH] Valid error numbers are all positive numbers
There is error in journal log:
gnome-session-c[4905]: Error creating FIFO: File exists
The errno can't be negative number.
https://gitlab.gnome.org/GNOME/gnome-session/-/merge_requests/42
---
gnome-session/main.c | 2 +-
tools/gnome-session-ctl.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnome-session/main.c b/gnome-session/main.c
index 01f56667..c1dda5dc 100644
--- a/gnome-session/main.c
+++ b/gnome-session/main.c
@@ -349,7 +349,7 @@ systemd_leader_run(void)
fifo_name = g_strdup_printf ("%s/gnome-session-leader-fifo",
g_get_user_runtime_dir ());
res = mkfifo (fifo_name, 0666);
- if (res < 0 && errno != -EEXIST)
+ if (res < 0 && errno != EEXIST)
g_warning ("Error creating FIFO: %m");
fifo_fd = g_open (fifo_name, O_WRONLY | O_CLOEXEC, 0666);
diff --git a/tools/gnome-session-ctl.c b/tools/gnome-session-ctl.c
index 9276a0ad..86f03be1 100644
--- a/tools/gnome-session-ctl.c
+++ b/tools/gnome-session-ctl.c
@@ -194,7 +194,7 @@ do_monitor_leader (void)
fifo_name = g_strdup_printf ("%s/gnome-session-leader-fifo",
g_get_user_runtime_dir ());
res = mkfifo (fifo_name, 0666);
- if (res < 0 && errno != -EEXIST)
+ if (res < 0 && errno != EEXIST)
g_warning ("Error creating FIFO: %m");
data.fifo_fd = g_open (fifo_name, O_RDONLY | O_CLOEXEC, 0666);
--
2.26.0

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Apr 15 01:20:42 UTC 2020 - Xiaoguang Wang <xiaoguang.wang@suse.com>
- Add gnome-session-error-numbers-wrong.patch: Remove erron in log
'gnome-session-c[4905]: Error creating FIFO: File exists'
(bsc#1169165 glgo!GNOME/gnome-session#42).
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Mar 16 03:51:13 UTC 2020 - Xiaoguang Wang <xwang@suse.com> Mon Mar 16 03:51:13 UTC 2020 - Xiaoguang Wang <xwang@suse.com>

View File

@ -33,6 +33,8 @@ Patch0: gnome-session-better-handle-empty-xdg_session_type.patch
Patch1: gnome-session-remove-gsd-XSettings.patch Patch1: gnome-session-remove-gsd-XSettings.patch
# PATCH-FIX-OPENSUSE gnome-session-s390-not-require-g-s-d_wacom.patch bsc#1129412 yfjiang@suse.com -- Remove the runtime requirement of g-s-d Wacom plugin # PATCH-FIX-OPENSUSE gnome-session-s390-not-require-g-s-d_wacom.patch bsc#1129412 yfjiang@suse.com -- Remove the runtime requirement of g-s-d Wacom plugin
Patch2: gnome-session-s390-not-require-g-s-d_wacom.patch Patch2: gnome-session-s390-not-require-g-s-d_wacom.patch
# PATCH-FIX-UPSTREAM gnome-session-error-numbers-wrong.patch bsc#1169165 glgo!GNOME/gnome-session#42 xwang@suse.com -- Valid error numbers are all positive numbers
Patch3: gnome-session-error-numbers-wrong.patch
BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook-xsl-stylesheets
BuildRequires: fdupes BuildRequires: fdupes
@ -111,6 +113,7 @@ functional GNOME desktop.
%ifarch s390 s390x %ifarch s390 s390x
%patch2 -p1 %patch2 -p1
%endif %endif
%patch3 -p1
translation-update-upstream po gnome-session-3.0 translation-update-upstream po gnome-session-3.0
%build %build