From bcae6dd40485fce886c08c101d39226d6aba7022 Mon Sep 17 00:00:00 2001 From: Arch Librarian Date: Mon, 20 Sep 2004 16:56:59 +0000 Subject: [PATCH] Fixed the resetting of Dir with "dir {};". Closes: #87323 Author: jgg Date: 2001-03-04 00:44:35 GMT Fixed the resetting of Dir with "dir {};". Closes: #87323 --- apt-pkg/contrib/configuration.cc | 9 ++++++--- debian/changelog | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index 18dded669..81521590a 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.16 2001/03/03 23:29:55 jgg Exp $ +// $Id: configuration.cc,v 1.17 2001/03/04 00:44:35 jgg Exp $ /* ###################################################################### Configuration Class @@ -573,6 +573,7 @@ bool ReadConfigFile(Configuration &Conf,string FName,bool AsSectional, // Parse off the word string Word; + bool NoWord = false; if (ParseCWord(Pos,Word) == false && ParseQuoteWord(Pos,Word) == false) { @@ -580,7 +581,8 @@ bool ReadConfigFile(Configuration &Conf,string FName,bool AsSectional, { Word = Tag; Tag = ""; - } + } + NoWord = true; } if (strlen(Pos) != 0) return _error->Error(_("Syntax error %s:%u: Extra junk after value"),FName.c_str(),CurLine); @@ -648,7 +650,8 @@ bool ReadConfigFile(Configuration &Conf,string FName,bool AsSectional, else { // Set the item in the configuration class - Conf.Set(Item,Word); + if (NoWord == false) + Conf.Set(Item,Word); } // Empty the buffer diff --git a/debian/changelog b/debian/changelog index 594915b75..96d948e66 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,7 @@ apt (0.5.1) unstable; urgency=low * Some instances where the status file can source a package in a non-sensical way. Closes: #87390 * Work better if there are duplicate sources.list entries. + * Fixed the resetting of Dir with "dir {};". Closes: #87323 -- Jason Gunthorpe Thu, 22 Feb 2001 00:39:15 -0500 -- 2.50.0