44 lines
1.4 KiB
Diff
44 lines
1.4 KiB
Diff
commit 26fc51cc073ef75f8468c3ac88f86f16edd922b1
|
|
Author: Daniel Nicoletti <dantti12@gmail.com>
|
|
Date: Mon Apr 2 21:38:07 2012 -0300
|
|
|
|
Fix updating that requires installing/updating packages from untrusted sources
|
|
BUG: 289398
|
|
|
|
diff --git a/Sentinel/UpdateIcon.cpp b/Sentinel/UpdateIcon.cpp
|
|
index 8aa1349..ac88df6 100644
|
|
--- a/Sentinel/UpdateIcon.cpp
|
|
+++ b/Sentinel/UpdateIcon.cpp
|
|
@@ -56,7 +56,6 @@ UpdateIcon::UpdateIcon(QObject* parent)
|
|
|
|
UpdateIcon::~UpdateIcon()
|
|
{
|
|
- removeStatusNotifierItem();
|
|
}
|
|
|
|
void UpdateIcon::showSettings()
|
|
diff --git a/libapper/PkTransaction.cpp b/libapper/PkTransaction.cpp
|
|
index 5a6e51d..6afd213 100644
|
|
--- a/libapper/PkTransaction.cpp
|
|
+++ b/libapper/PkTransaction.cpp
|
|
@@ -283,7 +283,7 @@ void PkTransaction::updatePackages()
|
|
Transaction *trans = new Transaction(this);
|
|
setupTransaction(trans);
|
|
setTransaction(trans, Transaction::RoleUpdatePackages);
|
|
- trans->updatePackages(d->packages, true);
|
|
+ trans->updatePackages(d->packages, d->onlyTrusted);
|
|
if (trans->error()) {
|
|
showSorry(i18n("Failed to update package"),
|
|
PkStrings::daemonError(trans->error()));
|
|
@@ -299,10 +299,7 @@ void PkTransaction::cancel()
|
|
|
|
void PkTransaction::setTransaction(Transaction *trans, Transaction::Role role)
|
|
{
|
|
- if (!trans) {
|
|
- // 0 pointer passed
|
|
- return;
|
|
- }
|
|
+ Q_ASSERT(trans);
|
|
|
|
m_trans = trans;
|
|
d->role = role;
|