summaryrefslogtreecommitdiff
path: root/cmdline/apt-cache.cc
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2006-03-01 12:36:32 +0000
committerMichael Vogt <mvo@debian.org>2006-03-01 12:36:32 +0000
commit131a2dc0cb36c29d002c2a61f96411e5d84f4adf (patch)
tree82cf88aec560d0810a26fc101be1c593e1a80f69 /cmdline/apt-cache.cc
parent5c4d7f0764f99ebe6e65933b1bc08671dbab98e9 (diff)
parent9005c2b7f600d23c5ebf7c7cab295d036627bd6c (diff)
* merged with debian-sid branch
Patches applied: * bubulle@debian.org--2005/apt--main--0--patch-160 Italian translation update * bubulle@debian.org--2005/apt--main--0--patch-161 Galician translation completed * bubulle@debian.org--2005/apt--main--0--patch-162 Spanish translation update * bubulle@debian.org--2005/apt--main--0--patch-163 Two strings corrected in the British translation * bubulle@debian.org--2005/apt--main--0--patch-164 Danish translation update * bubulle@debian.org--2005/apt--main--0--patch-165 Completed Greek translation * bubulle@debian.org--2005/apt--main--0--patch-166 Fix some permissions * bubulle@debian.org--2005/apt--main--0--patch-167 Resync with Michael * bubulle@debian.org--2005/apt--main--0--patch-168 Vietnamese translation completed * bubulle@debian.org--2005/apt--main--0--patch-169 Update PO files and POT file...again * bubulle@debian.org--2005/apt--main--0--patch-170 Compelted French translation * bubulle@debian.org--2005/apt--main--0--patch-171 Activate Welsh translation * bubulle@debian.org--2005/apt--main--0--patch-172 Completed to 512 strings * bubulle@debian.org--2005/apt--main--0--patch-173 Russian translation completed * bubulle@debian.org--2005/apt--main--0--patch-174 Swedish translation completed * bubulle@debian.org--2005/apt--main--0--patch-175 Merge from Philippe Batailler French manpages tree/Vietnamese translation update * bubulle@debian.org--2005/apt--main--0--patch-176 Galician translation update * bubulle@debian.org--2005/apt--main--0--patch-177 Slovak translation update * bubulle@debian.org--2005/apt--main--0--patch-178 Polish translation update * bubulle@debian.org--2005/apt--main--0--patch-179 Correct permissions * bubulle@debian.org--2005/apt--main--0--patch-180 Japanese translation update * bubulle@debian.org--2005/apt--main--0--patch-181 Basque translation update * bubulle@debian.org--2005/apt--main--0--patch-182 Catalan translation completed * bubulle@debian.org--2005/apt--main--0--patch-183 Brazilian Portuguese translation update * bubulle@debian.org--2005/apt--main--0--patch-184 Italian translation update * bubulle@debian.org--2005/apt--main--0--patch-185 Japanese manpages translation update * bubulle@debian.org--2005/apt--main--0--patch-186 Simplified Chinese translation update * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-120 * added debian-archive-keyring to recommends * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-121 * merged with bubulle * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-122 * fix apt-key to ask for the correct package * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-123 * fix typo in apt-cache.8 manpage * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-124 * fixed another typo in doc/apt-secure.8.xml * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-125 * merged the debian-sid changes back * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-126 * fixed the changelog yet again * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-127 * merged with apt--mvo * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-128 * don't explod if a Provides has DepCompareOp * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-129 * fix regression about not working --print-uris in "install" * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-130 * merged with bubulle * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-131 * create sources.list.d as well * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-132 * make apt-cache madion wotk without deb-src lines * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-133 * only clean out the list dir if the update was successful * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-134 * only remove the sigfile if pkgAcqMetaSig::Failed() didn't fail for a network error * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-135 tyop * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-136 * merged with bubulle * mvo@debian.org--2005/apt--debian-sid--0--patch-18 * merged with apt--mvo * mvo@debian.org--2005/apt--debian-sid--0--patch-19 * synced with mainline * mvo@debian.org--2005/apt--debian-sid--0--patch-20 * merged with mainline, finalized changelog * philippe.batailler@free.fr--2005/apt--main--0--patch-9 manpages
Diffstat (limited to 'cmdline/apt-cache.cc')
-rw-r--r--cmdline/apt-cache.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index cb1aeb514..74fa71cba 100644
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1630,10 +1630,11 @@ bool Madison(CommandLine &CmdL)
pkgCache &Cache = *GCache;
- // Create the text record parsers
+ // Create the src text record parsers and ignore errors about missing
+ // deb-src lines that are generated from pkgSrcRecords::pkgSrcRecords
pkgSrcRecords SrcRecs(*SrcList);
if (_error->PendingError() == true)
- return false;
+ _error->Discard();
for (const char **I = CmdL.FileList + 1; *I != 0; I++)
{