diff options
| author | Daniel Burrows <Daniel_Burrows@alumni.brown.edu> | 2009-03-06 08:22:53 -0800 |
|---|---|---|
| committer | Daniel Burrows <Daniel_Burrows@alumni.brown.edu> | 2009-03-06 08:22:53 -0800 |
| commit | 17b3813cfad54b0ef14e70ad71e2d3ba49abfafe (patch) | |
| tree | 81666c1f469fc4bf0fdcca4ea66411c34ea6a03a | |
| parent | 1ba20bc48f7e4e109682f5be7b3d6343af0eeb93 (diff) | |
Fix FindFile (and FindDir) so that the value of RootDir is applied to the default if no value is found.
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.
| -rw-r--r-- | apt-pkg/contrib/configuration.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index 7326b84ea..a82311a3f 100644 --- 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; |