From 3d661e4aa122dedcf830062f34b1db18cb45fc59 Mon Sep 17 00:00:00 2001
From: Michael Vogt <egon@pop>
Date: Fri, 3 Sep 2010 20:49:09 +0200
Subject: apt-pkg/indexcopy.cc: include trustedFile (if it exists)

---
 apt-pkg/indexcopy.cc | 8 +++-----
 1 file 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);
-- 
cgit v1.2.3