apt-pkg/cdrom.h: move new member to the end to minimize ABI risk

[apt.git] / cmdline / apt-mark

diff --git a/cmdline/apt-mark b/cmdline/apt-mark
index 0e73dda7863c72cdaa4dd8b542c8c10ee13b55e7..c64d4356cc101e3c6dafcc7c0d04f646d7cad9b4 100755 (executable)
--- a/cmdline/apt-mark
+++ b/cmdline/apt-mark
@@ -8,7 +8,7 @@ import os.path
 try:
     import apt_pkg
 except ImportError:
 try:
     import apt_pkg
 except ImportError:

-    print "Error importing apt_pkg, is python-apt installed?"
+    print >> sys.stderr, "Error importing apt_pkg, is python-apt installed?"

     sys.exit(1)
     
 actions = { "markauto" : 1,
     sys.exit(1)
     
 actions = { "markauto" : 1,


@@ -68,6 +68,7 @@ if __name__ == "__main__":
     # option parsing
     parser = OptionParser()
     parser.usage = "%prog [options] {markauto|unmarkauto} packages..."
     # option parsing
     parser = OptionParser()
     parser.usage = "%prog [options] {markauto|unmarkauto} packages..."

+    parser.epilog = "apt-mark is deprecated, use apt-get markauto/unmarkauto."

     parser.add_option("-f", "--file", action="store", type="string",
                       dest="filename",
                       help="read/write a different file")
     parser.add_option("-f", "--file", action="store", type="string",
                       dest="filename",
                       help="read/write a different file")


@@ -76,12 +77,19 @@ if __name__ == "__main__":
                       help="print verbose status messages to stdout")
     (options, args) = parser.parse_args()
 
                       help="print verbose status messages to stdout")
     (options, args) = parser.parse_args()
 

+    if not args:
+        parser.print_help()
+        sys.exit(1)
+

     # get the state-file
     if not options.filename:
         STATE_FILE = apt_pkg.config.find_dir("Dir::State") + "extended_states"
     else:
         STATE_FILE=options.filename
 
     # get the state-file
     if not options.filename:
         STATE_FILE = apt_pkg.config.find_dir("Dir::State") + "extended_states"
     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:
     if args[0] == "showauto":
         show_automatic(STATE_FILE)
     else: