diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-03-12 22:10:42 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-03-12 22:10:42 +0100 |
| commit | d92dd27135d8a26793d3ad28534f2aaeb5fc7680 (patch) | |
| tree | 3a8e55e739dde1626e049bb5424ea919fa623d92 /cmdline | |
| parent | 188c9558929fe6732f799a31f6005532022b2b94 (diff) | |
| parent | 0d6c5e7dcb2d4fe5334a4177aff3a2b6e55e6768 (diff) | |
* cmdline/apt-get.cc:
- if apt-get source foo=version or foo/distro can not be found,
error out (LP: #502641)
* apt-pkg/indexfile.cc:
- deal correctly with three letter langcodes (LP: #391409)
Diffstat (limited to 'cmdline')
| -rw-r--r-- | cmdline/apt-get.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index a39b5c55a..ea236676b 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1317,9 +1317,11 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, if (Src.empty() == true) { // Sources files have no codename information - if (VerTag.empty() == true && DefRel.empty() == false) - _error->Warning(_("Ignore unavailable target release '%s' of package '%s'"), DefRel.c_str(), TmpSrc.c_str()); - DefRel.clear(); + if (VerTag.empty() == true && DefRel.empty() == false) + { + _error->Error(_("Ignore unavailable target release '%s' of package '%s'"), DefRel.c_str(), TmpSrc.c_str()); + return 0; + } } } if (Src.empty() == true) @@ -1386,8 +1388,8 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, if (Last != 0 || VerTag.empty() == true) break; //if (VerTag.empty() == false && Last == 0) - _error->Warning(_("Ignore unavailable version '%s' of package '%s'"), VerTag.c_str(), TmpSrc.c_str()); - VerTag.clear(); + _error->Error(_("Ignore unavailable version '%s' of package '%s'"), VerTag.c_str(), TmpSrc.c_str()); + return 0; } if (Last == 0 || Last->Jump(Offset) == false) |