summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <egon@pop>2010-09-03 20:49:09 +0200
committerMichael Vogt <egon@pop>2010-09-03 20:49:09 +0200
commit3d661e4aa122dedcf830062f34b1db18cb45fc59 (patch)
tree75c5f2889481b5be570b42afcc5a080d795694f8
parent5b777e8f77c946e9502e7f855ff1c196ee5b85b6 (diff)
apt-pkg/indexcopy.cc: include trustedFile (if it exists)
-rw-r--r--apt-pkg/indexcopy.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc
index fb33ed461..0abbf63de 100644
--- a/apt-pkg/indexcopy.cc
+++ b/apt-pkg/indexcopy.cc
@@ -675,11 +675,9 @@ bool SigVerify::RunGPGV(std::string const &File, std::string const &FileGPG,
std::vector<string> keyrings;
if (DirectoryExists(trustedPath))
- {
- keyrings = GetListOfFilesInDir(trustedPath, "gpg", false, true);
- if (FileExists(trustedFile) == true)
- keyrings.push_back(trustedFile);
- }
+ keyrings = GetListOfFilesInDir(trustedPath, "gpg", false, true);
+ if (FileExists(trustedFile) == true)
+ keyrings.push_back(trustedFile);
std::vector<const char *> Args;
Args.reserve(30);