Просмотр исходного кода

* added APT::Authentication::Trust-CDROM option

Patches applied:

 * michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--base-0
   tag of apt@packages.debian.org/apt--main--0--patch-79

 * michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--patch-1
   * implemented "TrustCDROM" mode

 * michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--patch-2
   * added APT::Authentication::TrustCDROM to the configure-index
Michael Vogt лет назад: 21
Родитель
Сommit
e8cdc56aaf
3 измененных файлов с 12 добавлено и 1 удалено
  1. 4 0
      apt-pkg/deb/debmetaindex.cc
  2. 3 1
      debian/changelog
  3. 5 0
      doc/examples/configure-index

+ 4 - 0
apt-pkg/deb/debmetaindex.cc

@@ -165,6 +165,10 @@ bool debReleaseIndex::IsTrusted() const
    string VerifiedSigFile = _config->FindDir("Dir::State::lists") +
    string VerifiedSigFile = _config->FindDir("Dir::State::lists") +
       URItoFileName(MetaIndexURI("Release")) + ".gpg";
       URItoFileName(MetaIndexURI("Release")) + ".gpg";
    
    
+   if(_config->FindB("APT::Authentication::Trust-CDROM", false))
+      if(URI.substr(0,strlen("cdrom:")) == "cdrom:")
+	 return true;
+   
    if (FileExists(VerifiedSigFile))
    if (FileExists(VerifiedSigFile))
       return true;
       return true;
    return false;
    return false;

+ 3 - 1
debian/changelog

@@ -16,7 +16,9 @@ apt (0.6.41.1) unstable; urgency=low
     (closes: #316318, #327456)
     (closes: #316318, #327456)
   * fix leak in the mmap code, thanks to Daniel Burrows for the
   * fix leak in the mmap code, thanks to Daniel Burrows for the
     patch (closes: #250583)
     patch (closes: #250583)
-  * support for apt-get source -t (and honor pining)
+  * support for apt-get source -t (and honor pining) (closes: #152129)
+  * added "APT::Authentication::Trust-CDROM" option to make the life
+    for the installer people easier (closes: #334656)
   
   
  --
  --
 
 

+ 5 - 0
doc/examples/configure-index

@@ -72,6 +72,11 @@ APT
      NoAct "false";
      NoAct "false";
   };
   };
 
 
+  Authentication
+  {
+     Trust-CDROM "false";            // consider the CDROM always trusted
+  };
+
   GPGV
   GPGV
   {
   {
      TrustedKeyring "/etc/apt/trusted.gpg";
      TrustedKeyring "/etc/apt/trusted.gpg";