diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2012-11-01 10:44:13 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2012-11-01 10:44:13 +0100 |
| commit | f69b2c3d2984cd4dca485fb05ab84df94067c50d (patch) | |
| tree | 11ac3bcba3399c2fa5c8d7fc45555d490a0497ff /cmdline/apt-get.cc | |
| parent | 6292ea19bc71d0c1b977693195dcf9153bd07555 (diff) | |
| parent | 446fb1002ad218929f3a6da911388b160b738f2a (diff) | |
merged from the debian-sid branch
Diffstat (limited to 'cmdline/apt-get.cc')
| -rw-r--r-- | cmdline/apt-get.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 4bbe0c492..ede5ed6d3 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1255,7 +1255,9 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, { if (_config->FindB("APT::Get::Trivial-Only",false) == true) return _error->Error(_("Trivial Only specified but this is not a trivial operation.")); - + + // TRANSLATOR: This string needs to be typed by the user as a confirmation, so be + // careful with hard to type or special characters (like non-breaking spaces) const char *Prompt = _("Yes, do as I say!"); ioprintf(c2out, _("You are about to do something potentially harmful.\n" @@ -2941,7 +2943,7 @@ bool DoBuildDep(CommandLine &CmdL) for (; Ver != verlist.end(); ++Ver) { forbidden.clear(); - if (Ver->MultiArch == pkgCache::Version::None) + if (Ver->MultiArch == pkgCache::Version::None || Ver->MultiArch == pkgCache::Version::All) { if (colon == string::npos) Pkg = Ver.ParentPkg().Group().FindPkg(hostArch); |