From c914647fb05653878a14ae391f52b5e94cc73b26 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 7 Sep 2009 14:59:19 +0200 Subject: reintroduce #clear and #include in the config files, they there broken since 0.7.21 with the introduction of #-comments --- apt-pkg/contrib/configuration.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'apt-pkg/contrib') diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index b83ece3e4..4e8586e83 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -601,9 +601,11 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool AsSectional, InQuote = !InQuote; if (InQuote == true) continue; - - if ((*I == '/' && I + 1 != End && I[1] == '/') || *I == '#') - { + + if ((*I == '/' && I + 1 != End && I[1] == '/') || + (*I == '#' && strcmp(string(I,I+6).c_str(),"#clear") != 0 && + strcmp(string(I,I+8).c_str(),"#include") != 0)) + { End = I; break; } -- cgit v1.2.3