Skip to content

cherry-pick bug-fix of release/eagle #360

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
Dec 18, 2025
Merged

cherry-pick bug-fix of release/eagle #360

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
07438e3
fix: [env] set user`s environment to QApt (#334)
LiHua000 Jun 17, 2025
09ed262
fix: 双击ddim文件使用软件包安装器打开
myk1343 Nov 20, 2024
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
2 changes: 1 addition & 1 deletion assets/deepin-deb-installer.desktop
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Exec=deepin-deb-installer %F
GenericName=Package Installer
Icon=deepin-deb-installer
Keywords=package;installer;deepin;dde;dpkg;apt;
MimeType=application/vnd.debian.binary-package;application/x-deb;application/x-executable;
MimeType=application/vnd.debian.binary-package;application/x-deb;application/x-executable;application/x-ddim;
Name=Package Installer
StartupNotify=false
Terminal=false
Expand Down
2 changes: 2 additions & 0 deletions src/deb-installer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ else()
if(${QAPT_VERSION_STR} VERSION_GREATER_EQUAL "3.0.5.1-1-deepin1" AND ${QAPT_VERSION_STR} MATCHES ".*deepin.*")
message(STATUS "enable virtual package enhance")
add_definitions(-DENABLE_VIRTUAL_PACKAGE_ENHANCE)
# Qt5环境且QApt版本>=3.0.5.1-1-deepin1，支持setEnvVariable方法
add_definitions(-DENABLE_QAPT_SETENV)
else()
message(STATUS "disable virtual package enhance")
endif()
Expand Down
28 changes: 28 additions & 0 deletions src/deb-installer/model/deblistmodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,6 +557,21 @@ bool DebListModel::slotUninstallPackage(int index)

m_currentTransaction = transsaction; // 保存trans指针

#ifdef ENABLE_QAPT_SETENV // Qt5环境且qapt >= 3.0.5.1-1-deepin1，支持setEnvVariable
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
QVariantMap map;

m_currentTransaction = transsaction; //保存trans指针
// 获取当前真实用户信息
QString currentUser = env.value("USER");
// 如果SUDO_USER存在，说明当前是通过sudo启动的
QString realUser = env.value("SUDO_USER");
if (realUser.isEmpty())
realUser = currentUser;
map.insert("SUDO_USER", realUser);
transsaction->setEnvVariable(map);
#endif

qCDebug(appLog) << "Starting uninstall transaction for package:" << packageId;
transsaction->run(); // 开始卸载

Expand Down Expand Up @@ -1238,6 +1253,19 @@ void DebListModel::installDebs()

m_currentTransaction = transaction;

#ifdef ENABLE_QAPT_SETENV // Qt5环境且qapt >= 3.0.5.1-1-deepin1，支持setEnvVariable
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
QVariantMap map;

// 获取当前真实用户信息
QString currentUser = env.value("USER");
// 如果SUDO_USER存在，说明当前是通过sudo启动的
QString realUser = env.value("SUDO_USER");
if (realUser.isEmpty())
realUser = currentUser;
map.insert("SUDO_USER", realUser);
m_currentTransaction->setEnvVariable(map);
#endif
qCDebug(appLog) << "Running current transaction";
m_currentTransaction->run();
}
Expand Down
Loading