diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-02-18 15:39:03 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-02-18 15:39:03 +0100 |
| commit | 113942be71c90e7d6a9cff93cc05ac119db526de (patch) | |
| tree | 2872bfb8c3b12dc8f9fe9e1622ddffeea528d4e6 /apt-pkg/deb | |
| parent | b9dacd11a4707092f070d49b1cb1acff642eebf0 (diff) | |
| parent | 3c5a611808e7af5aec4c2ab12ce0bce79f74928d (diff) | |
merge from the lp:~donkult/apt/sid branch
Diffstat (limited to 'apt-pkg/deb')
| -rw-r--r-- | apt-pkg/deb/debmetaindex.cc | 5 | ||||
| -rw-r--r-- | apt-pkg/deb/dpkgpm.cc | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index 8f28f053b..520e94a80 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -181,6 +181,7 @@ bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool GetAll) const for (vector<string>::const_iterator l = lang.begin(); l != lang.end(); l++) { + if (*l == "none") continue; debTranslationsIndex i = debTranslationsIndex(URI,Dist,(*I)->Section,(*l).c_str()); i.GetIndexes(Owner); } @@ -219,8 +220,10 @@ vector <pkgIndexFile *> *debReleaseIndex::GetIndexFiles() Indexes->push_back(new debPackagesIndex (URI, Dist, (*I)->Section, IsTrusted())); for (vector<string>::const_iterator l = lang.begin(); - l != lang.end(); l++) + l != lang.end(); l++) { + if (*l == "none") continue; Indexes->push_back(new debTranslationsIndex(URI,Dist,(*I)->Section,(*l).c_str())); + } } } diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 9d144a227..fb6054f79 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -1063,7 +1063,7 @@ bool pkgDPkgPM::Go(int OutStatusFd) // wait for input or output here FD_ZERO(&rfds); - if (!stdin_is_dev_null) + if (master >= 0 && !stdin_is_dev_null) FD_SET(0, &rfds); FD_SET(_dpkgin, &rfds); if(master >= 0) |