From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Fri, 3 Sep 2010 18:22:15 +0000 (+0200)
Subject: * apt-pkg/indexcopy.cc:
X-Git-Tag: 0.8.3~3^2~2
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/5b777e8f77c946e9502e7f855ff1c196ee5b85b6?hp=0205540433440a9ff4ad4ea4cce44c700a4b401c

* apt-pkg/indexcopy.cc:
  - only use trusted.gpg.d directory if it exists
---

diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc
index a2a1d5934..fb33ed461 100644
--- a/apt-pkg/indexcopy.cc
+++ b/apt-pkg/indexcopy.cc
@@ -673,9 +673,13 @@ bool SigVerify::RunGPGV(std::string const &File, std::string const &FileGPG,
       std::clog << "Keyring path: " << trustedPath << std::endl;
    }
 
-   std::vector<string> keyrings = GetListOfFilesInDir(trustedPath, "gpg", false);
-   if (FileExists(trustedFile) == true)
-      keyrings.push_back(trustedFile);
+   std::vector<string> keyrings;
+   if (DirectoryExists(trustedPath))
+   {
+       keyrings = GetListOfFilesInDir(trustedPath, "gpg", false, true);
+       if (FileExists(trustedFile) == true)
+          keyrings.push_back(trustedFile);
+   }
 
    std::vector<const char *> Args;
    Args.reserve(30);
diff --git a/configure.in b/configure.in
index 8b212c1bc..151885d66 100644
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.7.26~exp6")
+AC_DEFINE_UNQUOTED(VERSION,"0.8.1")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)
diff --git a/debian/changelog b/debian/changelog
index 2a3a9d89c..c81026041 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (0.8.2) unstable; urgency=low
+
+  * apt-pkg/indexcopy.cc:
+    - only use trusted.gpg.d directory if it exists
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 03 Sep 2010 20:21:43 +0200
+
 apt (0.8.1) UNRELEASED; urgency=low
 
   [ Programs translations ]