From 19cd03deb719782f178bad59744a853c24ad0d58 Mon Sep 17 00:00:00 2001
From: heppen <hepeng68@huawei.com>
Date: Wed, 14 May 2025 14:51:16 +0800
Subject: [PATCH] =?UTF-8?q?fix(eagle.spec):=20=E4=BF=AE=E5=A4=8D=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7=E5=90=8E=E6=97=A0=E6=B3=95=E5=88=A0=E9=99=A4eagle?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 517c578375785236668f9e2862a4897528e8e4aa)
---
 eagle.spec | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/eagle.spec b/eagle.spec
index 3ac89c7..db52666 100644
--- a/eagle.spec
+++ b/eagle.spec
@@ -1,6 +1,6 @@
 Name:             eagle
 Version:          1.1.0
-Release:          6
+Release:          7
 Summary:          eagle kit
 License:          Mulan PSL v2
 URL:              https://gitee.com/openeuler/eagle
@@ -54,7 +54,10 @@ install -m 0755 release/eagle/lib/libsched_service.so %{buildroot}/%{_sysconfdir
 install -m 0755 release/eagle/lib/libidle_service.so %{buildroot}/%{_sysconfdir}/eagle/plugin
 
 %post
-useradd -m eagle
+if [ "$1" -eq 1 ] || [ ! -d /home/eagle ]; then
+    id eagle &>/dev/null || useradd -m eagle
+fi
+
 chown -R eagle:eagle /etc/eagle
 if [ ! -d /var/log/eagle ]; then
     mkdir /var/log/eagle
@@ -74,16 +77,22 @@ sleep 5 # sleep for 5 seconds to wait for powerapi update admin list.
 systemctl start eagle.service
 
 %preun
-systemctl stop eagle.service
-systemctl disable eagle.service
-userdel -r eagle
+systemctl stop eagle.service  || :
+systemctl disable eagle.service || :
+
+# 仅在真正卸载（$1==0）时才删除用户
+if [ "$1" -eq 0 ]; then
+    if id eagle &>/dev/null; then
+        userdel -r eagle
+    fi
+fi
 
 %post -n python3-eagle-mpctool
-systemctl start mpctool.service
+systemctl start mpctool.service || :
 
 %preun -n python3-eagle-mpctool
-systemctl stop mpctool.service
-systemctl disable mpctool.service
+systemctl stop mpctool.service    || :
+systemctl disable mpctool.service || :
 
 %files
 %{_sysconfdir}/eagle/*
@@ -98,6 +107,9 @@ systemctl disable mpctool.service
 %{python3_sitelib}/*
 
 %changelog
+* Wed May 14 2025 heppen<hepeng68@huawei.com> - 1.1.0-7
+- Bug fix: Unable to delete eagle user after upgrade
+
 * Mon Dec 9 2024 heppen<hepeng68@huawei.com> - 1.1.0-6
 - Bug fix: spelling errors of freq_service and idle_service
 
-- 
Gitee