From 1dca5b3aeaab8a90bf7a5d1f67a154653b3903e1 Mon Sep 17 00:00:00 2001
From: kkz <zhaoshuang@uniontech.com>
Date: Wed, 26 Jul 2023 14:59:55 +0800
Subject: [PATCH] fix the issue output err msg repeatly

---
 dde-daemon.spec                             |  9 ++++--
 fix-the-issue-output-err-msg-repeatly.patch | 33 +++++++++++++++++++++
 2 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 fix-the-issue-output-err-msg-repeatly.patch

diff --git a/dde-daemon.spec b/dde-daemon.spec
index b7f5b0c..852b635 100644
--- a/dde-daemon.spec
+++ b/dde-daemon.spec
@@ -12,7 +12,7 @@
 
 Name:           dde-daemon
 Version:        5.12.0.18
-Release:        6
+Release:        7
 Summary:        Daemon handling the DDE session settings
 License:        GPLv3
 URL:            http://shuttle.corp.deepin.com/cache/tasks/18802/unstable-amd64/
@@ -20,6 +20,8 @@ Source0:        %{name}-%{version}.orig.tar.xz
 Source1:        vendor.tar.gz	
 Source2:        %{sname}.sysusers	
 
+Patch0:		fix-the-issue-output-err-msg-repeatly.patch
+
 BuildRequires:  python3
 BuildRequires:  golang
 BuildRequires:  deepin-gettext-tools
@@ -65,7 +67,7 @@ Recommends:     google-noto-sans-fonts
 Daemon handling the DDE session settings
 
 %prep
-%autosetup
+%autosetup -p1
 tar -xf %{SOURCE1}
 patch langselector/locale.go < rpm/locale.go.patch
 
@@ -183,6 +185,9 @@ fi
 %{_sysusersdir}/%{sname}.conf
 
 %changelog
+* Wed Jul 26 2023 zhaoshuang<zhaoshuang@uniontech.com> - 5.12.0.18-7
+- fix: fix the issue output err msg repeatly
+
 * Wed May 31 2023 Wenlong Zhang<zhangwenlong@loongson.cn> - 5.12.0.18-6
 - update sys to 0.4.0 to support loong64
 
diff --git a/fix-the-issue-output-err-msg-repeatly.patch b/fix-the-issue-output-err-msg-repeatly.patch
new file mode 100644
index 0000000..18d1694
--- /dev/null
+++ b/fix-the-issue-output-err-msg-repeatly.patch
@@ -0,0 +1,33 @@
+From 2ceb0832c314e0aff80bc34a882e65fd114f6819 Mon Sep 17 00:00:00 2001
+From: kkz <zhaoshuang@uniontech.com>
+Date: Wed, 26 Jul 2023 16:40:31 +0800
+Subject: [PATCH] fix-the-issue-output-err-msg-repeatly
+
+---
+ loader/module.go | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/loader/module.go b/loader/module.go
+index e49f5fa..36dd734 100644
+--- a/loader/module.go
++++ b/loader/module.go
+@@ -20,7 +20,6 @@
+ package loader
+ 
+ import (
+-	"fmt"
+ 	"pkg.deepin.io/lib/log"
+ )
+ 
+@@ -72,7 +71,7 @@ func (d *ModuleBase) doEnable(enable bool) error {
+ 
+ func (d *ModuleBase) Enable(enable bool) error {
+ 	if d.enabled == enable {
+-		return fmt.Errorf("%s daemon is already started", d.name)
++		return nil
+ 	}
+ 	return d.doEnable(enable)
+ }
+-- 
+2.27.0
+
-- 
Gitee