summaryrefslogtreecommitdiff
path: root/apt-pkg/sourcelist.cc
diff options
context:
space:
mode:
authorJames McCoy <jamessan@debian.org>2016-04-19 22:27:21 -0400
committerJulian Andres Klode <jak@debian.org>2016-05-10 20:53:16 +0200
commitbddb663c5d46072c1dbd72a69c1745d598e9c0eb (patch)
tree2fe63b2ff5792414549e4bedb8c34b130f6e2e19 /apt-pkg/sourcelist.cc
parente4848fe0e8f124eb8221cd947e7564b25a1f6539 (diff)
deb822: Restore support for <multivalue>-{Add,Remove}
Redesign of multivalue options in 463c8d801595ce5ac94d7c032264820be7434232 caused the parser to look for <multivalue>{Add,Remove} (no hyphen) instead of the expected <multivalue>-{Add,Remove}. (cherry picked from commit f5585106d61b381c9dcf8f1dd48c742dc68f6c81)
Diffstat (limited to 'apt-pkg/sourcelist.cc')
-rw-r--r--apt-pkg/sourcelist.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc
index 82d2ed3c6..afbf3e665 100644
--- a/apt-pkg/sourcelist.cc
+++ b/apt-pkg/sourcelist.cc
@@ -98,8 +98,8 @@ bool pkgSourceList::Type::ParseStanza(vector<metaIndex *> &List, /*{{{*/
std::map<char const * const, std::pair<char const * const, bool> > mapping;
#define APT_PLUSMINUS(X, Y) \
mapping.insert(std::make_pair(X, std::make_pair(Y, true))); \
- mapping.insert(std::make_pair(X "Add", std::make_pair(Y "+", true))); \
- mapping.insert(std::make_pair(X "Remove", std::make_pair(Y "-", true)))
+ mapping.insert(std::make_pair(X "-Add", std::make_pair(Y "+", true))); \
+ mapping.insert(std::make_pair(X "-Remove", std::make_pair(Y "-", true)))
APT_PLUSMINUS("Architectures", "arch");
APT_PLUSMINUS("Languages", "lang");
APT_PLUSMINUS("Targets", "target");