Skip to content

Feat: [log] Can not build in v20. #419

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepin-bot merged 2 commits into from
Nov 13, 2025
Merged

Feat: [log] Can not build in v20. #419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28bd9be
Feat: [log] Can not build in v20.
GongHeng2017 Nov 11, 2025
fd0b6a8
fix: package installation failure and stuck
GongHeng2017 Nov 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions application/logallexportthread.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,11 @@ void LogAllExportThread::ensureDirectoriesExist(const QString &filePath)
}

// Extract directory parts from file path
#if (QT_VERSION <= QT_VERSION_CHECK(5, 15, 0))
QStringList pathParts = filePath.split('/', QString::SkipEmptyParts);
#else
QStringList pathParts = filePath.split('/', Qt::SkipEmptyParts);
#endif
if (pathParts.size() <= 1) return; // No directories to create

QString currentPath;
Expand Down
13 changes: 8 additions & 5 deletions debian/deepin-log-viewer.postinst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,19 @@ sysTimer="coredump-reporter.timer"
#根据已登陆的用户开启后端定时任务
for userName in ${userNameArr[@]} ; do
#获取服务状态
serviceStatus=$(runuser -l ${userName} -c "XDG_RUNTIME_DIR=\"/run/user/$(id -u ${userName})\" systemctl --user is-active ${sysTimer}")
serviceStatus=$(runuser -f -l ${userName} -c "XDG_RUNTIME_DIR=\"/run/user/$(id -u ${userName})\" systemctl --user is-active ${sysTimer}")
#活跃的关键字
activeStr="active"
#如果为活跃的则表示服务已开启
if [ "$serviceStatus" = "$activeStr" ];then
#如果服务已经启动则重新加载
runuser -l ${userName} -c "XDG_RUNTIME_DIR=\"/run/user/$(id -u ${userName})\" systemctl --user daemon-reload" || true
runuser -f -l ${userName} -c "XDG_RUNTIME_DIR=\"/run/user/$(id -u ${userName})\" systemctl --user daemon-reload" || true
else
#如果服务没有启动则设置开启
runuser -l ${userName} -c "XDG_RUNTIME_DIR=\"/run/user/$(id -u ${userName})\" systemctl --user enable ${sysTimer}" || true
#runuser -l ${userName} -c "XDG_RUNTIME_DIR=\"/run/user/$(id -u ${userName})\" systemctl --user start ${sysTimer}"
runuser -f -l ${userName} -c "XDG_RUNTIME_DIR=\"/run/user/$(id -u ${userName})\" systemctl --user enable ${sysTimer}" || true
#runuser -f -l ${userName} -c "XDG_RUNTIME_DIR=\"/run/user/$(id -u ${userName})\" systemctl --user start ${sysTimer}"
fi
done
done

#确保软件包安装不会失败
exit 0