summaryrefslogtreecommitdiff
path: root/cmdline
diff options
context:
space:
mode:
Diffstat (limited to 'cmdline')
-rw-r--r--cmdline/apt-get.cc12
-rwxr-xr-xcmdline/apt-mark3
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: