diff options
| author | Michael Vogt <mvo@debian.org> | 2014-06-18 11:21:35 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-06-18 11:24:16 +0200 |
| commit | 8d20b69d2fd7a8fec82bb559f0e39059bbaecf1b (patch) | |
| tree | 000fce642c5c12f3cc8b5472bcd03994c78b5050 /apt-pkg/edsp.cc | |
| parent | 17091f2f33de16c2dae501e7868f7aec4fc3452f (diff) | |
| parent | 82ced5c894cd013721f432ae8da66114155e04c7 (diff) | |
Merge remote-tracking branch 'donkult/debian/sid' into debian/experimental
Conflicts:
apt-private/private-install.cc
Diffstat (limited to 'apt-pkg/edsp.cc')
| -rw-r--r-- | apt-pkg/edsp.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/apt-pkg/edsp.cc b/apt-pkg/edsp.cc index 6d1b68c23..0d0418e06 100644 --- a/apt-pkg/edsp.cc +++ b/apt-pkg/edsp.cc @@ -26,6 +26,7 @@ #include <time.h> #include <unistd.h> #include <stdio.h> +#include <algorithm> #include <iostream> #include <vector> #include <limits> @@ -50,7 +51,12 @@ bool EDSP::WriteScenario(pkgDepCache &Cache, FILE* output, OpProgress *Progress) if (Progress != NULL) Progress->SubProgress(Cache.Head().VersionCount, _("Send scenario to solver")); unsigned long p = 0; + std::vector<std::string> archs = APT::Configuration::getArchitectures(); for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false; ++Pkg) + { + std::string const arch = Pkg.Arch(); + if (std::find(archs.begin(), archs.end(), arch) == archs.end()) + continue; for (pkgCache::VerIterator Ver = Pkg.VersionList(); Ver.end() == false; ++Ver, ++p) { WriteScenarioVersion(Cache, output, Pkg, Ver); @@ -59,6 +65,7 @@ bool EDSP::WriteScenario(pkgDepCache &Cache, FILE* output, OpProgress *Progress) if (Progress != NULL && p % 100 == 0) Progress->Progress(p); } + } return true; } /*}}}*/ |