summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-03-12 10:13:44 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2010-03-12 10:13:44 +0100
commiteefacd4c6653485b3da8dc267a8068207398464b (patch)
tree2b0e1ef79bea418c8ac0c62a1958f457637ddbf3
parent4d7ac88c6827fab1e25238415ed0ebdf7d7f5404 (diff)
* cmdline/apt-mark:
- show error on incorrect aguments (LP: #517917), thanks to Torsten Spindler
-rwxr-xr-xcmdline/apt-mark3
-rw-r--r--debian/changelog3
2 files changed, 6 insertions, 0 deletions
diff --git a/cmdline/apt-mark b/cmdline/apt-mark
index 2326ece38..466a56f27 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:
diff --git a/debian/changelog b/debian/changelog
index fb378b59a..ffbc9f459 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,9 @@ apt (0.7.25.4) UNRELEASED; urgency=low
http://ispras.linuxfoundation.org/index.php/ABI_compliance_checker
* 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
[ Robert Collins ]
* Change the package index Info methods to allow apt-cache policy to be