Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -610,8 +610,7 @@ QList<DriverManager::TDriverInfo> DriverManager::parsePrinterInfo(const QByteArr
bool DriverManager::printerHasInstalled(const QString &packageName)
{
QProcess p;
QString cmd = "sudo dpkg -s " + packageName;
p.start(cmd);
p.start("dpkg", QStringList() << "-s" << packageName);
p.waitForFinished(-1);

QByteArray r = p.readAll();
Expand All @@ -626,7 +625,7 @@ bool DriverManager::printerHasInstalled(const QString &packageName)
bool DriverManager::installPrinter(const QString &packageName)
{
QProcess p;
p.start("sudo apt install " + packageName);
p.start("apt", QStringList() << "install" << packageName);
p.waitForFinished(-1);

return printerHasInstalled(packageName);
Expand All @@ -640,7 +639,7 @@ bool DriverManager::installPrinter(const QString &packageName)
bool DriverManager::unInstallPrinter(const QString &packageName)
{
QProcess p;
p.start("sudo dpkg -r " + packageName);
p.start("dpkg", QStringList() << "-r" << packageName);
p.waitForFinished(-1);

return !printerHasInstalled(packageName);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@
return true;
}

bool Utils::unInstallPackage(const QString &packageName)

Check warning on line 89 in deepin-devicemanager-server/deepin-devicecontrol/src/drivercontrol/utils.cpp

View workflow job for this annotation

GitHub Actions / cppcheck

The function 'unInstallPackage' is never used.
{
QProcess process;
process.start(QString("apt remove %1").arg(packageName));
process.start("apt", QStringList() << "remove" << packageName);
if (!process.waitForFinished())
return false;
return true;
Expand Down
3 changes: 1 addition & 2 deletions deepin-devicemanager/src/Page/PageInfo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,10 @@
return m_multiFlag;
}

bool PageInfo::packageHasInstalled(const QString &packageName)

Check warning on line 67 in deepin-devicemanager/src/Page/PageInfo.cpp

View workflow job for this annotation

GitHub Actions / cppcheck

The function 'packageHasInstalled' is never used.
{
QProcess p;
QString cmd = "dpkg -s " + packageName;
p.start(cmd);
p.start("dpkg", QStringList() << "-s" << packageName);
p.waitForFinished(-1);

QByteArray r = p.readAll();
Expand Down