diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-03-26 16:04:49 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-03-26 16:04:49 +0100 |
| commit | 47371b0047432ba7a5ee87173b00f912cdcd14e6 (patch) | |
| tree | a9ced108b6ae38e7ab1338d55c43e0285f3959ea /cmdline | |
| parent | b34d4b4745e4f7ead090a03e5efe35bd2e2e82b5 (diff) | |
| parent | 131418cfb2b83fb725fff62b0401252fef5655e2 (diff) | |
* apt-pkg/deb/dpkgpm.cc:
- fix backgrounding when dpkg runs (closes: #486222)
* cmdline/apt-mark:
- show error on incorrect aguments (LP: #517917), thanks to
Torsten Spindler
* cmdline/apt-get.cc:
- if apt-get source foo=version or foo/distro can not be found,
error out (LP: #502641)
* apt-pkg/packagemanager.cc:
- better debug output
* doc/examples/configure-index:
- add missing Debug::pkgPackageManager option
Diffstat (limited to 'cmdline')
| -rw-r--r-- | cmdline/apt-get.cc | 12 | ||||
| -rwxr-xr-x | cmdline/apt-mark | 3 |
2 files changed, 10 insertions, 5 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 5a814e255..3c90354b0 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) diff --git a/cmdline/apt-mark b/cmdline/apt-mark index 0e73dda78..31383d987 100755 --- a/cmdline/apt-mark +++ b/cmdline/apt-mark @@ -82,6 +82,9 @@ if __name__ == "__main__": else: STATE_FILE=options.filename + if len(args) == 0: + parser.error("first argument must be 'markauto', 'unmarkauto' or 'showauto'") + if args[0] == "showauto": show_automatic(STATE_FILE) else: |