From 212080b87daa25944259287a5a625e63dd696ff0 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Sun, 11 Dec 2011 01:30:45 +0100
Subject: * apt-pkg/cdrom.cc:   - support InRelease files on cdrom

---
 apt-pkg/cdrom.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'apt-pkg/cdrom.cc')

diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index f5c19a4d6..d9ecdf4f6 100644
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -68,12 +68,11 @@ bool pkgCdrom::FindPackages(string CD,
    if (RealFileExists(".aptignr") == true)
       return true;
 
-
    /* Check _first_ for a signature file as apt-cdrom assumes that all files
       under a Packages/Source file are in control of that file and stops 
       the scanning
    */
-   if (RealFileExists("Release.gpg") == true)
+   if (RealFileExists("Release.gpg") == true || RealFileExists("InRelease") == true)
    {
       SigList.push_back(CD);
    }
@@ -718,6 +717,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log)					/*{{{*/
    DropRepeats(List,"Packages");
    DropRepeats(SourceList,"Sources");
    DropRepeats(SigList,"Release.gpg");
+   DropRepeats(SigList,"InRelease");
    DropRepeats(TransList,"");
    if(log != NULL) {
       msg.str("");
-- 
cgit v1.2.3