From 836c46623ca94c94f2a9118492f163ad1424a267 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 13 Sep 2011 16:23:20 +0200
Subject: [PATCH] * cherry pick r1825 from lp:~mvo/apt/mvo:   *
 apt-pkg/contrib/configuration.cc:   - fix double delete (LP: #848907)   -
 ignore only the invalid regexp instead of all options

---
 apt-pkg/contrib/configuration.cc | 9 +++++----
 debian/changelog                 | 9 +++++++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index ece05e8f6..2db191ba2 100644
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -870,10 +870,10 @@ Configuration::MatchAgainstConfig::MatchAgainstConfig(char const * Config)
       {
 	 regfree(p);
 	 delete p;
-	 clearPatterns();
-	 _error->Warning("Regex compilation error for '%s' in configuration option '%s'",
-				s->c_str(), Config);
-	 return;
+	 _error->Warning("Invalid regular expression '%s' in configuration "
+                         "option '%s' will be ignored.",
+                         s->c_str(), Config);
+	 continue;
       }
    }
    if (strings.size() == 0)
@@ -894,6 +894,7 @@ void Configuration::MatchAgainstConfig::clearPatterns()
       regfree(*p);
       delete *p;
    }
+   patterns.clear();
 }
 									/*}}}*/
 // MatchAgainstConfig::Match - returns true if a pattern matches	/*{{{*/
diff --git a/debian/changelog b/debian/changelog
index 1f0886f06..a4d19bec6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+apt (0.8.16~exp5ubuntu8) UNRELEASEDoneiric; urgency=low
+
+  * cherry pick r1825 from lp:~mvo/apt/mvo:
+    * apt-pkg/contrib/configuration.cc:
+    - fix double delete (LP: #848907)
+    - ignore only the invalid regexp instead of all options
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 13 Sep 2011 16:22:20 +0200
+
 apt (0.8.16~exp5ubuntu7) oneiric; urgency=low
 
   [ Michael Vogt ]
-- 
2.50.0