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 /cmdline/apt-get.cc | |
| parent | 3102af74e7ffaab3f47741c05451ce7f0e3b38fe (diff) | |
| parent | b9ed63d39e8771f42ec74e3ad401b7c1e846b206 (diff) | |
merged from lp:~donkult/apt/experimental/
Diffstat (limited to 'cmdline/apt-get.cc')
| -rw-r--r-- | cmdline/apt-get.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 2d0554e21..32ee46980 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2863,10 +2863,16 @@ bool DoBuildDep(CommandLine &CmdL) if ((BADVER(Ver)) == false) { string forbidden; - if (Ver->MultiArch == pkgCache::Version::None || Ver->MultiArch == pkgCache::Version::All); + if (Ver->MultiArch == pkgCache::Version::None || Ver->MultiArch == pkgCache::Version::All) + { + if (colon == string::npos) + { + Pkg = Ver.ParentPkg().Group().FindPkg(hostArch); + } + } else if (Ver->MultiArch == pkgCache::Version::Same) { - if (colon != string::npos) + if (colon == string::npos) Pkg = Ver.ParentPkg().Group().FindPkg(hostArch); else if (strcmp(D->Package.c_str() + colon, ":any") == 0) forbidden = "Multi-Arch: same"; |