From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 10 Dec 2009 20:45:31 +0000 (+0100)
Subject: merged -r 1918..1919 from lp:~donkult/apt/sid
X-Git-Tag: 0.7.25~8^2~2
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/3f35be50ee4cb425b08139d4ccf5b54d527fe700?ds=inline;hp=--cc

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

3f35be50ee4cb425b08139d4ccf5b54d527fe700
diff --git a/cmdline/apt-mark b/cmdline/apt-mark
index c44ce7038..3a818a3db 100755
--- a/cmdline/apt-mark
+++ b/cmdline/apt-mark
@@ -2,13 +2,14 @@
 
 from optparse import OptionParser
 
+import sys
+import os.path
+    
 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
diff --git a/debian/changelog b/debian/changelog
index 679753cfb..c4a6d0705 100644
--- 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)
+    - print an error and exit if python-apt is not installed,
+      thanks Carl Chenet! (Closes: #521284)
 
   [ Chris Leick ]
   * doc/ various manpages: