diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2011-12-11 01:30:45 +0100 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2011-12-11 01:30:45 +0100 |
| commit | 212080b87daa25944259287a5a625e63dd696ff0 (patch) | |
| tree | 1a87ff73345f04454607c14d60f09b01613b296c /apt-pkg/cdrom.cc | |
| parent | 711078ae18df09ca4f0c371c071c59458fad3918 (diff) | |
* apt-pkg/cdrom.cc:
- support InRelease files on cdrom
Diffstat (limited to 'apt-pkg/cdrom.cc')
| -rw-r--r-- | apt-pkg/cdrom.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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(""); |