summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Klumpp <matthias@tenstral.net>2012-04-14 14:44:06 +0200
committerMatthias Klumpp <matthias@tenstral.net>2012-04-14 14:44:06 +0200
commitd5f576c34dd53ad6147e19a1975fbb63e7d74c2f (patch)
treee0f0037bc0d24f55f0bd10ecfb7fb21404ec1d52
parentebf0153aa8ef019efa08e1a69dfe91d6f83ce733 (diff)
trivial: Correct mistakes from previous commit
-rw-r--r--backends/aptcc/apt-intf.cpp8
-rw-r--r--backends/aptcc/apt-intf.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/backends/aptcc/apt-intf.cpp b/backends/aptcc/apt-intf.cpp
index 636e7f49..a5ef7dfd 100644
--- a/backends/aptcc/apt-intf.cpp
+++ b/backends/aptcc/apt-intf.cpp
@@ -1117,7 +1117,7 @@ void AptIntf::emitFiles(PkBackend *backend, const gchar *pi)
}
}
-bool AptIntf::checkTrusted(pkgAcquire &fetcher)
+bool AptIntf::checkTrusted(pkgAcquire &fetcher, bool simulating)
{
string UntrustedList;
PkgList untrusted;
@@ -1134,7 +1134,7 @@ bool AptIntf::checkTrusted(pkgAcquire &fetcher)
if (untrusted.empty()) {
return true;
- } else {
+ } else if (simulating) {
emit_packages(untrusted, PK_FILTER_ENUM_NONE, PK_INFO_ENUM_UNTRUSTED);
}
@@ -1653,7 +1653,7 @@ void AptIntf::updateInterface(int fd, int writeFd)
* DoAutomaticRemove - Remove all automatic unused packages
*
* Remove unused automatic packages
-*/
+ */
bool AptIntf::DoAutomaticRemove(pkgCacheFile &Cache)
{
bool doAutoRemove;
@@ -2228,7 +2228,7 @@ bool AptIntf::installPackages(pkgCacheFile &Cache, bool simulating)
}
}
- if ((simulating) && (!checkTrusted(fetcher))) {
+ if ((!checkTrusted(fetcher, simulating)) && (!simulating)) {
return false;
}
diff --git a/backends/aptcc/apt-intf.h b/backends/aptcc/apt-intf.h
index f23fec13..e8c85b01 100644
--- a/backends/aptcc/apt-intf.h
+++ b/backends/aptcc/apt-intf.h
@@ -163,7 +163,7 @@ private:
PkBackend *m_backend;
bool &_cancel;
- bool checkTrusted(pkgAcquire &fetcher);
+ bool checkTrusted(pkgAcquire &fetcher, bool simulating);
bool TryToInstall(const pkgCache::PkgIterator &constPkg,
pkgDepCache &Cache,
pkgProblemResolver &Fix,