From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 7 Sep 2010 08:02:59 +0000 (+0200)
Subject: * apt-pkg/indexcopy.cc:
X-Git-Tag: 0.8.3~3
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/92e85e0b782ac79c795de60adc094b0c015e490d?hp=-c

* apt-pkg/indexcopy.cc:
  - only use trusted.gpg.d directory if it exists
  - do not replace /dev/null when running in APT::CDROM::NoAct
    mode (LP: #612666), thanks to Colin Watson
---

92e85e0b782ac79c795de60adc094b0c015e490d
diff --combined apt-pkg/indexcopy.cc
index ed037027c,3156778d4..f88d51fc5
--- a/apt-pkg/indexcopy.cc
+++ b/apt-pkg/indexcopy.cc
@@@ -132,9 -132,14 +132,14 @@@ bool IndexCopy::CopyPackages(string CDR
  	       (*I).c_str() + CDROM.length(),GetFileName());
        string TargetF = _config->FindDir("Dir::State::lists") + "partial/";
        TargetF += URItoFileName(S);
+       FileFd Target;
        if (_config->FindB("APT::CDROM::NoAct",false) == true)
+       {
  	 TargetF = "/dev/null";
-       FileFd Target(TargetF,FileFd::WriteAtomic);
+          Target.Open(TargetF,FileFd::WriteExists);
+       } else {
+          Target.Open(TargetF,FileFd::WriteAtomic);
+       }
        FILE *TargetFl = fdopen(dup(Target.Fd()),"w");
        if (_error->PendingError() == true)
  	 return false;
@@@ -661,7 -666,7 +666,7 @@@ bool SigVerify::RunGPGV(std::string con
  {
     string const gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv");
     // FIXME: remove support for deprecated APT::GPGV setting
 -   string const trustedFile = _config->FindFile("Dir::Etc::Trusted");
 +   string const trustedFile = _config->Find("APT::GPGV::TrustedKeyring", _config->FindFile("Dir::Etc::Trusted"));
     string const trustedPath = _config->FindDir("Dir::Etc::TrustedParts");
  
     bool const Debug = _config->FindB("Debug::Acquire::gpgv", false);
@@@ -673,9 -678,11 +678,11 @@@
        std::clog << "Keyring path: " << trustedPath << std::endl;
     }
  
-    std::vector<string> keyrings = GetListOfFilesInDir(trustedPath, "gpg", false);
+    std::vector<string> keyrings;
+    if (DirectoryExists(trustedPath))
+      keyrings = GetListOfFilesInDir(trustedPath, "gpg", false, true);
     if (FileExists(trustedFile) == true)
-       keyrings.push_back(trustedFile);
+      keyrings.push_back(trustedFile);
  
     std::vector<const char *> Args;
     Args.reserve(30);
diff --combined debian/changelog
index 667640f98,3cdeb593f..b5ff68555
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,27 -1,13 +1,36 @@@
 -apt (0.8.2) unstable; urgency=low
++apt (0.8.3) UNRELEASED; urgency=low
+ 
+   * apt-pkg/indexcopy.cc:
+     - only use trusted.gpg.d directory if it exists
+     - do not replace /dev/null when running in APT::CDROM::NoAct
+       mode (LP: #612666), thanks to Colin Watson
+ 
 - -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 03 Sep 2010 20:21:43 +0200
++ -- Michael Vogt <mvo@debian.org>  Tue, 07 Sep 2010 10:02:02 +0200
++
 +apt (0.8.2) unstable; urgency=low
 +
 +  [ Manpages translations ]
 +  * Spanish (Omar Campagne). Closes: #595557
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/versionmatch.cc:
 +    - do not accept 'Pin: origin "' (missing closing ") as a valid
 +      way to pin a local archive: either "" or none…
 +  * 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)
 +  * apt-pkg/indexcopy.cc:
 +    - support really still the APT::GPGV::TrustedKeyring setting,
 +      as it breaks d-i badly otherwise (Closes: #595428)
 +  * cmdline/apt-key:
 +    - support also Dir::Etc::Trusted so that apt-key works in the same
 +      way as the library part which works with the trusted files
 +  * methods/{gzip,bzip2}.cc:
 +    - empty files can never be valid archives (Closes: #595691)
 +
 + -- Michael Vogt <mvo@debian.org>  Mon, 06 Sep 2010 18:10:06 +0200
  
 -apt (0.8.1) UNRELEASED; urgency=low
 +apt (0.8.1) unstable; urgency=low
  
    [ Programs translations ]
    * Thai (Theppitak Karoonboonyanan). Closes: #592695
@@@ -35,9 -21,6 +44,9 @@@
    * Bulgarian (Damyan Ivanov). Closes: #594627
    * Portuguese (Miguel Figueiredo). Closes: #594668
    * Korean (Changwoo Ryu). Closes: #594809
 +  * Norwegian Bokmål (Hans Nordhaug). Closes: #595182
 +  * Danish (Joe Hansen). Closes: #595176
 +  * Catalan (Agustí Grau). Closes: #595234
  
    [ Christian Perrier ]
    * Fix spelling error in cmdline/apt-get.cc. Thanks to Osamu Aoki
@@@ -66,8 -49,11 +75,8 @@@
      - 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)
  
 - -- David Kalnischkies <kalnischkies@gmail.com>  Thu, 02 Sep 2010 12:41:32 +0200
 + -- Michael Vogt <mvo@debian.org>  Fri, 03 Sep 2010 18:36:11 +0200
  
  apt (0.8.0) unstable; urgency=low