diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2012-01-31 11:21:02 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2012-01-31 11:21:02 +0100 |
| commit | c7ed2c0e34546e12a035e4c4c2f034a6ee765748 (patch) | |
| tree | dcfd5eb735b8ea547142be68f993a3f555ecb0b0 /apt-pkg/contrib/configuration.cc | |
| parent | 3102af74e7ffaab3f47741c05451ce7f0e3b38fe (diff) | |
| parent | b9ed63d39e8771f42ec74e3ad401b7c1e846b206 (diff) | |
merged from lp:~donkult/apt/experimental/
Diffstat (limited to 'apt-pkg/contrib/configuration.cc')
| -rw-r--r-- | apt-pkg/contrib/configuration.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index 0949ec223..36866a35a 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -185,8 +185,14 @@ string Configuration::FindFile(const char *Name,const char *Default) const } string val = Itm->Value; - while (Itm->Parent != 0 && Itm->Parent->Value.empty() == false) - { + while (Itm->Parent != 0) + { + if (Itm->Parent->Value.empty() == true) + { + Itm = Itm->Parent; + continue; + } + // Absolute if (val.length() >= 1 && val[0] == '/') break; |