* 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 a2a1d59347ecbbda5bb9a5f5a4d85eaac63dfbf8..fb33ed46141c914e84be687e7b532e8e2b795c27 100644 (file)
--- 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 8b212c1bc002f7271574072f95767b3c4093ca19..151885d66e64b27e524cc66700c124be7a158684 100644 (file)
--- 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 2a3a9d89cf626f5f786f4e22116be53864060211..c810260412b5f910c4d92f17f041ebcaea108140 100644 (file)
--- 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 ]