Merge remote-tracking branch 'upstream/dev' into dev

This commit is contained in:
uniartisan 2022-10-12 09:31:38 +08:00
commit 746e9bd3d6
2 changed files with 1 additions and 2 deletions

1
debian/changelog vendored
View File

@ -1,7 +1,6 @@
spark-store (3.2.4~test2) stable; urgency=medium spark-store (3.2.4~test2) stable; urgency=medium
* 客户端集成投稿器入口和支持 * 客户端集成投稿器入口和支持
* 更新和安装设置入口转移到左列列表
* 修复:安装依赖时间较长时错误地返回“安装完毕”结果 * 修复:安装依赖时间较长时错误地返回“安装完毕”结果

View File

@ -1128,7 +1128,7 @@ void Widget::on_pushButton_uninstall_clicked()
QProcess uninstall; QProcess uninstall;
uninstall.start("pkexec", QStringList() << "apt" << "purge" << "-y" << pkgName.toLower()); uninstall.start("pkexec", QStringList() << "apt" << "purge" << "-y" << pkgName.toLower());
uninstall.waitForFinished(180); // 默认超时 3 分钟 uninstall.waitForFinished(-1); // 默认无限时长
QProcess check; QProcess check;
check.start("dpkg", QStringList() << "-s" << pkgName.toLower()); check.start("dpkg", QStringList() << "-s" << pkgName.toLower());