diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2012-01-30 21:16:56 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2012-01-30 21:16:56 +0100 |
| commit | bdd64a80842fea20d69741cbc01f1929c51a6ed6 (patch) | |
| tree | a4d680abe2d44987ee939daeb3f691570a2e2ad8 /apt-pkg/contrib | |
| parent | 6487ecc977eabcca059e4e7fd62545c9826282bd (diff) | |
| parent | a13554816fac2ab7c5e876355f7b929790722b2c (diff) | |
merged from lp:~mvo/apt/mvo (and lp:~donkult/apt/experimental)
Diffstat (limited to 'apt-pkg/contrib')
| -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; |