* Give a warning if an illegal type abbreviation is use...

Author: mdz
Date: 2003-07-25 20:45:13 GMT
* Give a warning if an illegal type abbreviation is used when looking up a
configuration item (Closes: #168453)

diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index b0d705b075afd2ffaefac4b34df60e66caa755dc..56eb374c6e4c130c90cf735a76a747a7033b2659 100644 (file)
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: configuration.cc,v 1.25 2002/11/09 19:52:03 doogie Exp $
+// $Id: configuration.cc,v 1.26 2003/07/25 20:45:13 mdz Exp $
 /* ######################################################################
 
    Configuration Class
@@ -383,13 +383,17 @@ bool Configuration::ExistsAny(const char *Name) const
 {
    string key = Name;
 
-   if (key.size() > 2 && key.end()[-2] == '/' &&
-       key.find_first_of("fdbi",key.size()-1) < key.size())
-   {
-      key.resize(key.size() - 2);
-      if (Exists(key.c_str()))
-        return true;
-   }
+   if (key.size() > 2 && key.end()[-2] == '/')
+      if (key.find_first_of("fdbi",key.size()-1) < key.size())
+      {
+         key.resize(key.size() - 2);
+         if (Exists(key.c_str()))
+            return true;
+      }
+      else
+      {
+         _error->Warning("Unrecognized type abbreviation: '%c'", key.end()[-3]);
+      }
 
    return Exists(Name);
 }

diff --git a/debian/changelog b/debian/changelog
index becccbfff8772f2e6ce8f1b61a128ceb465712b4..1a6b6fa8b8186a2b625b65a4131c1740504d5e25 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ apt (0.5.8) unstable; urgency=low
   * Clarify the meaning of the only-source option in apt-get(8) (Closes: #177258)
   * Updated French man pages from Philippe Batailler
     <philippe.batailler@free.fr> (Closes: #182194)
+  * Give a warning if an illegal type abbreviation is used when looking up a
+    configuration item (Closes: #168453)
 
  --