merged -r 1918..1919 from lp:~donkult/apt/sid

diff --git a/cmdline/apt-mark b/cmdline/apt-mark
index c44ce7038047380800945c4897a8a27b11ea3362..3a818a3dbaa6bc27d9a8b8eaf7d5491f22b4af52 100755 (executable)
--- a/cmdline/apt-mark
+++ b/cmdline/apt-mark
@@ -2,13 +2,14 @@
 
 from optparse import OptionParser
 
 
 from optparse import OptionParser
 

+import sys
+import os.path
+    

 try:
     import apt_pkg
 except ImportError:
     print "Error importing apt_pkg, is python-apt installed?"
 try:
     import apt_pkg
 except ImportError:
     print "Error importing apt_pkg, is python-apt installed?"

-    
-import sys
-import os.path
+    sys.exit(1)

     
 actions = { "markauto" : 1,
             "unmarkauto": 0
     
 actions = { "markauto" : 1,
             "unmarkauto": 0

diff --git a/debian/changelog b/debian/changelog
index 679753cfb8d46c4fc48d0b423de70581de2fbe22..c4a6d0705e53ef4fe97c87b25031132e17a4dcfd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -81,6 +81,8 @@ apt (0.7.25) UNRELEASED; urgency=low
   * cmdline/apt-mark:
     - print an error if a new state file can't be created,
       thanks Carl Chenet! (Closes: #521289)
   * cmdline/apt-mark:
     - print an error if a new state file can't be created,
       thanks Carl Chenet! (Closes: #521289)

+    - print an error and exit if python-apt is not installed,
+      thanks Carl Chenet! (Closes: #521284)

 
   [ Chris Leick ]
   * doc/ various manpages:
 
   [ Chris Leick ]
   * doc/ various manpages: