From ce8419136565079d83f6188505a8415c88bbd39c Mon Sep 17 00:00:00 2001
From: zj <1052308357@qq.comm>
Date: Thu, 5 Feb 2026 03:12:45 +0800
Subject: [PATCH] fix

---
 .../occupation_resolver.cpython-314.pyc       | Bin 16484 -> 16657 bytes
 occupation_resolver.py                        |  22 +++++++++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/__pycache__/occupation_resolver.cpython-314.pyc b/__pycache__/occupation_resolver.cpython-314.pyc
index 68fa2dae034a24515d021d746e31ba17e758c991..acefa8dde588a0af0ff776ff3c1c347877b85423 100644
GIT binary patch
delta 661
zcmaFTz&Npqkx!eCmx}=iN_v|!SJ`dkGgB51U}6>h$N(Z&CVv3a8&iP%$<fMkOec6I
z%ZvL=4&dgRY$MFG`L6N}CN5V-Hzfv!0?rtQ$#q<^lW(b|F?vjPR2OCqVqk!Zm8n~B
zE(EIK4dV@vpFB}rN&>`G2U!dR>C6laG7R3b3=Cl$lM8r6n8J7`KUWXoN>K)hhp`2y
zPF|=YJUK=~i@gG<hBrVHWP})+_6a~Ks8V@e6Gn*9@(kXK85lSj<QQBTy;UKs812c^
zHMTSAPEOPj=GKR(1G-dua;~Q1<VTvqlkIg_Cm++4nXIKH%oD>0QxIS>nNdrV(FAC>
z@MJqJF-DWkp<3mPc+F8HXvXAFE$hjAx<QQQn-g`lI2mOo_n4J%uxA#hWTt19O#W~7
zivJdGZemGtMtoUnQBr<!>g0Fk9ZWoIlPfIJnI9;tOnzeVoRMwv8B2G@CzD02`s$_S
z=UdIRnr$<|<-WB1O$mh$Yz(4W*F_92iWqDVxguf)<Vz?lFu5YGenZdbf`s-LHU?Go
z<sOSXF6jDQ2ne~X5<0>6zPQQ_36<*-8W$xrR>)r0w7IBhvm@lPrqeYE=MNkVG79r;
zX4=fRn`3uFM&r7S&P5rW6(QGTjJ{|x$a0!}lw}ZC`QpL2`H$5JX2yAwkJ>F@2c@QO
kz%-O&-@v$F@>_cq#x;|L9Gv-cSr|n>Gl0k<DPTYY02r{cp8x;=

delta 497
zcmbQ(#Q3Cvkx!eCmx}=iq$-*-Z`*9-GgB6KV`3Hk$N(Z&CVv3a8&iP%$<fMkOi?_O
z<;8s_2XJ#uwh`vpd{_Af6O-GU$vf3L#oZYg!noBzW&uGuGXsMRgLfbU!{ohc@{=pn
zE!cAy7z%j9I3^eHh_Hn52FOpoFD^BiQ6q!{s@7-nSq;g_MH*Uyc?=Ak3~~(K?;v!H
z=44jQ?Tp%!1GR*?bs^?6FaSkwYdSLOO>7XEY^WtaSw>5EGPf=_qtWDiElnUf6HGel
zT5tZRWy6S1_j(=Nx_cQ-CofbH-uy^coRd*{@-MTJ$>ruRS&M)kW0;(8(ZTe9b@ES(
zbk+}S3@WOVlP#Y!a!mHNa%X%zd9qbsl!)ea5rc~&1{*}SOKp_eEOSM~?t!@c0+TD^
z>NoU^E=XuUk&&D4G0WqEs@n;c%QC(bT<?p^Of0=2p>kb9<D!Jd3eok_E2TGtT-LO@
zCSm<qkU`e$qb!5C$`^ypE3Hp3GtQY@WWRtN6jR@T@gwQbz&LO6EC&_FRg?ESIP)j7
PFp7R=0FgyfK<5Gg8Xb)^

diff --git a/occupation_resolver.py b/occupation_resolver.py
index a0f5f9d..b2e348d 100644
--- a/occupation_resolver.py
+++ b/occupation_resolver.py
@@ -183,7 +183,6 @@ class OccupationResolver:
         if main_mount_point and main_mount_point != 'N/A' and main_mount_point != '[SWAP]':
             logger.debug(f"设备 {device_path} 的主挂载点是 {main_mount_point}。")
 
-            # 尝试卸载嵌套挂载，并循环几次，因为某些挂载可能需要多次尝试
             max_unmount_attempts = 3
             for attempt in range(max_unmount_attempts):
                 logger.info(f"尝试卸载嵌套挂载点 (第 {attempt + 1} 次尝试)。")
@@ -203,7 +202,6 @@ class OccupationResolver:
                 return True # 主挂载点已卸载，设备应该已空闲
 
         # 3. 检查设备本身或其（可能已不存在的）主挂载点是否仍被占用 (fuser)
-        # 即使主挂载点已卸载，也可能存在进程直接占用设备文件的情况，或者之前卸载失败。
         fuser_targets = [device_path]
         if main_mount_point and main_mount_point != 'N/A' and main_mount_point != '[SWAP]' and main_mount_point not in fuser_targets:
             fuser_targets.append(main_mount_point)
@@ -227,14 +225,26 @@ class OccupationResolver:
             if success_fuser and stdout_fuser:
                 logger.debug(f"fuser -vm {target} 输出:\n{stdout_fuser}")
                 for line in stdout_fuser.splitlines():
-                    occupation_info_lines.append(line.strip())
+                    line = line.strip() # 清除行首尾空白
+                    if not line: # 跳过空行
+                        continue
 
+                    # 收集所有非空行用于最终显示
+                    occupation_info_lines.append(line)
+
+                    # 检查是否包含 "kernel" 关键字
                     if "kernel" in line:
                         kernel_mounts_found = True
 
-                    match = re.match(r'^\S+:\s+\S+\s+(?P<id>\d+)\s+.*', line)
-                    if match:
-                        pids_to_kill.add(match.group('id'))
+                    # 尝试从详细格式的行中提取 PID (例如: /dev/sda2: root 42032 .rce. gpg-agent)
+                    match_verbose = re.match(r'^\S+:\s+\S+\s+(?P<id>\d+)\s+.*', line)
+                    if match_verbose:
+                        pids_to_kill.add(match_verbose.group('id'))
+                    else:
+                        # 如果不是详细格式，检查是否是纯数字 PID (例如: 42032)
+                        # 这种情况下，fuser -vm 可能只输出了 PID
+                        if line.isdigit():
+                            pids_to_kill.add(line)
 
         pids_to_kill_list = list(pids_to_kill)