From 8d99802677287a86759232898199db40add923fd Mon Sep 17 00:00:00 2001
From: Arch Librarian <arch@canonical.com>
Date: Mon, 20 Sep 2004 17:02:17 +0000
Subject: * 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)

---
 apt-pkg/contrib/configuration.cc | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'apt-pkg/contrib/configuration.cc')

diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index b0d705b07..56eb374c6 100644
--- 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);
 }
-- 
cgit v1.2.3