* 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

diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index ece05e8f630db3d8c9894fa754f542cd1253b9c9..2db191ba294f7edb4caa3608f789217b38fc7d14 100644 (file)
--- 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;
       {
         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)
       }
    }
    if (strings.size() == 0)


@@ -894,6 +894,7 @@ void Configuration::MatchAgainstConfig::clearPatterns()
       regfree(*p);
       delete *p;
    }
       regfree(*p);
       delete *p;
    }

+   patterns.clear();

 }
                                                                        /*}}}*/
 // MatchAgainstConfig::Match - returns true if a pattern matches       /*{{{*/
 }
                                                                        /*}}}*/
 // MatchAgainstConfig::Match - returns true if a pattern matches       /*{{{*/

diff --git a/debian/changelog b/debian/changelog
index 1f0886f063c9a45044826e812d9a8d396401910a..a4d19bec66acc4599aade79d9f3caaf554956de7 100644 (file)
--- 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 ]
 apt (0.8.16~exp5ubuntu7) oneiric; urgency=low
 
   [ Michael Vogt ]