Fix FindFile (and FindDir) so that the value of RootDir is applied to the default...

Previously FindFile("Dir::etc", "/etc") would use RootDir if a value
existed for "Dir::etc"; otherwise it would go ahead and use "/etc",
ignoring RootDir.  Of course, this made RootDir fairly useless; it
has now been fixed.

diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index 7326b84ea227d0ca0fdfed16c43df39df164ec4c..a82311a3f45f875399272e829fd2873625e770bd 100644 (file)
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -182,9 +182,9 @@ string Configuration::FindFile(const char *Name,const char *Default) const
    if (Itm == 0 || Itm->Value.empty() == true)
    {
       if (Default == 0)
-        return "";
+        return rootDir;
       else
-        return Default;
+        return rootDir + Default;
    }
    
    string val = Itm->Value;