summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Burrows <dburrows@debian.org>2011-04-05 20:28:52 -0700
committerDaniel Burrows <dburrows@debian.org>2011-04-05 20:28:52 -0700
commita8d94be135abbf014545bf50e9f02cd105c61cc5 (patch)
tree9869afd38d66ea180f4345bb70a8f7916744bec2
parent9824d6d748aaed73ec8c5ff539ace4920f3caa13 (diff)
downloadaptitude-a8d94be135abbf014545bf50e9f02cd105c61cc5.tar.gz
For the string "~", use a name matcher instead of a term matcher. (Closes: #588089)
The fact that aptitude crashes with ?term when Xapian isn't installed is also concerning: it should do something "reasonable" instead. But what made this really painful is that aptitude was generating a term matcher for a lone tilde, which happens, um, whenever you start typing a search pattern with incremental search enabled...
-rw-r--r--src/generic/apt/matching/parse.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/generic/apt/matching/parse.cc b/src/generic/apt/matching/parse.cc
index a1fc768b..6d583417 100644
--- a/src/generic/apt/matching/parse.cc
+++ b/src/generic/apt/matching/parse.cc
@@ -1,6 +1,6 @@
// parse.cc
//
-// Copyright 2000-2005, 2007-2009 Daniel Burrows
+// Copyright 2000-2005, 2007-2009, 2011 Daniel Burrows
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -1131,7 +1131,7 @@ ref_ptr<pattern> parse_atom(string::const_iterator &start,
if(start == end)
{
- return pattern::make_term("~");
+ return pattern::make_name("~");
}
else
{