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?ds=inline;hp=-c

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

5b777e8f77c946e9502e7f855ff1c196ee5b85b6
diff --combined apt-pkg/indexcopy.cc
index a2a1d5934,a2a1d5934..fb33ed461
--- a/apt-pkg/indexcopy.cc
+++ b/apt-pkg/indexcopy.cc
@@@ -673,9 -673,9 +673,13 @@@ bool SigVerify::RunGPGV(std::string con
        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 --combined configure.in
index 8b212c1bc,8b212c1bc..151885d66
--- a/configure.in
+++ b/configure.in
@@@ -18,7 -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 --combined debian/changelog
index 2a3a9d89c,e37a5504f..c81026041
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -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 ]
@@@ -40,11 -40,8 +47,11 @@@
      - let the pin origin actually work as advertised in the manpage
        which means "" are optional and pinning a local archive does
        work - even if it is a non-flat archive (Closes: #594435)
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - create Dir::Log if needed to support /var/log as tmpfs or similar,
 +      inspired by Thomas Bechtold, thanks! (Closes: #523919, LP: #220239)
  
 - -- Michael Vogt <mvo@debian.org>  Mon, 30 Aug 2010 11:53:30 +0200
 + -- David Kalnischkies <kalnischkies@gmail.com>  Thu, 02 Sep 2010 12:41:32 +0200
  
  apt (0.8.0) unstable; urgency=low