Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Discover
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Plasma
Discover
Commits
d5b3f7af
Commit
d5b3f7af
authored
Dec 23, 2017
by
Aleix Pol Gonzalez
🐧
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make sure we don't show a spurious proceed dialog
parent
143d7345
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
libdiscover/backends/PackageKitBackend/PKTransaction.cpp
libdiscover/backends/PackageKitBackend/PKTransaction.cpp
+8
-8
No files found.
libdiscover/backends/PackageKitBackend/PKTransaction.cpp
View file @
d5b3f7af
...
...
@@ -155,15 +155,15 @@ void PKTransaction::cleanup(PackageKit::Transaction::Exit exit, uint runtime)
}
removedResources
.
subtract
(
m_apps
.
toList
().
toSet
());
QString
msg
=
QStringLiteral
(
"<ul><li>"
)
+
PackageKitResource
::
joinPackages
(
packagesToRemove
,
QStringLiteral
(
"</li><li>"
));
if
(
!
removedResources
.
isEmpty
())
{
const
QStringList
removedResourcesStr
=
kTransform
<
QStringList
>
(
removedResources
,
[](
AbstractResource
*
a
)
{
return
a
->
name
();
});
msg
+=
QLatin1Char
(
'\n'
);
msg
+=
removedResourcesStr
.
join
(
QStringLiteral
(
"</li><li>"
));
}
msg
+=
QStringLiteral
(
"</li></ul>"
);
if
(
!
packagesToRemove
.
isEmpty
()
||
!
removedResources
.
isEmpty
())
{
QString
msg
=
QStringLiteral
(
"<ul><li>"
)
+
PackageKitResource
::
joinPackages
(
packagesToRemove
,
QStringLiteral
(
"</li><li>"
));
if
(
!
removedResources
.
isEmpty
())
{
const
QStringList
removedResourcesStr
=
kTransform
<
QStringList
>
(
removedResources
,
[](
AbstractResource
*
a
)
{
return
a
->
name
();
});
msg
+=
QLatin1Char
(
'\n'
);
msg
+=
removedResourcesStr
.
join
(
QStringLiteral
(
"</li><li>"
));
}
msg
+=
QStringLiteral
(
"</li></ul>"
);
if
(
!
msg
.
isEmpty
())
{
Q_EMIT
proceedRequest
(
i18n
(
"Confirm..."
),
i18np
(
"To proceed with this action, the following package needs removal:
\n
%2"
,
"To proceed with this action, the following packages need removal:
\n
%2"
,
packagesToRemove
.
count
(),
msg
));
}
else
{
proceed
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment