From 01bbf1265d0b5b92d236cd6ac8098f3529a8f71d Mon Sep 17 00:00:00 2001 From: shenmo Date: Sat, 27 Dec 2025 10:44:49 +0000 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=93=E5=8C=85=E5=87=BA?= =?UTF-8?q?=E6=9D=A5=E7=9A=84=E5=BA=94=E7=94=A8=E5=8C=85=E5=90=AB=20.dpkg-?= =?UTF-8?q?new=20=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: shenmo --- src/usr/bin/amber-pm-convert | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/usr/bin/amber-pm-convert b/src/usr/bin/amber-pm-convert index 7835da5..385b307 100755 --- a/src/usr/bin/amber-pm-convert +++ b/src/usr/bin/amber-pm-convert @@ -648,6 +648,23 @@ fi sudo -E chrootEnvPath="$chrootEnvPath" /var/lib/apm/apm/files/ace-run-pkg rm -vfr /var/lib/aptss/lists || true sudo -E chrootEnvPath="$chrootEnvPath" /var/lib/apm/apm/files/ace-run-pkg rm -vfr /var/cache/apt/* || true +#清理 .dpkg-new 文件 +log.info "搜索并清理 .dpkg-new 文件..." +# 在 core 目录下查找并删除所有以 .dpkg-new 结尾的文件 +find "$CRAFT_DIR/core" -name "*.dpkg-new" -type f 2>/dev/null | while read -r file; do + log.info "删除: $file" + rm -f "$file" +done + +# 统计清理结果 +COUNT=$(find "$CRAFT_DIR/core" -name "*.dpkg-new" -type f 2>/dev/null | wc -l) +if [ "$COUNT" -eq 0 ]; then + log.info "已清理所有 .dpkg-new 文件" +else + log.warn "仍有 $COUNT 个 .dpkg-new 文件存在" +fi + + # 5. 创建新的 APM 包结构 log.info "创建新的APM包结构..." PKG_BUILD_DIR="$CRAFT_DIR/new-pkg"