From 461edaddf11653146d8e615b0359f5efbbfc64ef Mon Sep 17 00:00:00 2001 From: lou Date: Mon, 10 Aug 2026 18:02:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E7=90=86=20dh=20=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E6=AE=8B=E7=95=99=20(debian//=20=E4=B8=B4=E6=97=B6?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E4=B8=8D=E5=85=A5=E5=BA=93);=20gitignore=20?= =?UTF-8?q?=E5=8A=A0=E5=9B=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 4 ++++ debian/7z-encrypt-client/DEBIAN/md5sums | 2 +- debian/7z-encrypt-client/usr/share/7z-encrypt/backup.py | 6 +++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 4290678..9d51529 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,7 @@ config/tasks.db # Nuitka 编译产物 bin/ + +# dh 构建临时目录 +/debian/*/ +!/debian/source/ diff --git a/debian/7z-encrypt-client/DEBIAN/md5sums b/debian/7z-encrypt-client/DEBIAN/md5sums index f0bcfd1..9f42108 100644 --- a/debian/7z-encrypt-client/DEBIAN/md5sums +++ b/debian/7z-encrypt-client/DEBIAN/md5sums @@ -2,7 +2,7 @@ 440c53f84f5722b5146959c8fc6d7a23 usr/bin/sz-config ec8cf0df841e479689ccb681f6168ccc usr/bin/sz-transfer 0ba5b8147990daa7fd07344952c42847 usr/bin/sz-tui -78aed672b874d47ecb3e9dc12b6951a8 usr/share/7z-encrypt/backup.py +1c8e2524738649398a4385a3f2a9e3c6 usr/share/7z-encrypt/backup.py dcb31e74e0a6ee8073337fc4fb2acf99 usr/share/7z-encrypt/config.py 8a064c0b3c21d50812a3fd69a320d862 usr/share/7z-encrypt/crypto.py 21062e04f8c7f4471881a39c489dfa73 usr/share/7z-encrypt/metadata.py diff --git a/debian/7z-encrypt-client/usr/share/7z-encrypt/backup.py b/debian/7z-encrypt-client/usr/share/7z-encrypt/backup.py index 22d06c5..b300d60 100644 --- a/debian/7z-encrypt-client/usr/share/7z-encrypt/backup.py +++ b/debian/7z-encrypt-client/usr/share/7z-encrypt/backup.py @@ -33,10 +33,10 @@ COMPRESS_SUFFIX = {".db", ".sqlite", ".sqlite3", ".sql", ".txt", ".json", ".xml" def _7z(args: list[str]) -> None: - """调系统 7z (p7zip-full), 失败抛异常""" - r = subprocess.run(["7z"] + args, capture_output=True, text=True, timeout=7200) + """调系统 7z (p7zip-full), 实时透传进度输出 (7z 自带百分比进度条)""" + r = subprocess.run(["7z"] + args) if r.returncode != 0: - raise RuntimeError(f"7z 失败: {r.stderr.strip()[-200:] or r.stdout.strip()[-200:]}") + raise RuntimeError(f"7z 失败 (exit {r.returncode})") def _cfg() -> dict[str, Any]: