Ver código fonte

apt-pkg/indexcopy.cc: include trustedFile (if it exists)

Michael Vogt 16 anos atrás
pai
commit
3d661e4aa1
1 arquivos alterados com 3 adições e 5 exclusões
  1. 3 5
      apt-pkg/indexcopy.cc

+ 3 - 5
apt-pkg/indexcopy.cc

@@ -675,11 +675,9 @@ bool SigVerify::RunGPGV(std::string const &File, std::string const &FileGPG,
 
 
    std::vector<string> keyrings;
    std::vector<string> keyrings;
    if (DirectoryExists(trustedPath))
    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;
    std::vector<const char *> Args;
    Args.reserve(30);
    Args.reserve(30);