summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2009-11-25 23:40:36 +0100
committerDavid Kalnischkies <kalnischkies@gmail.com>2009-11-25 23:40:36 +0100
commit32e994d9c891ba379af7b292eeb81b4402d3f2af (patch)
treef3855ec5bb7d536c0fff29a599994904735e1f95
parentc0d438474bac961897f9e9472356222f79350c39 (diff)
print an error and exit if python-apt is not installed for apt-mark,
thanks Carl Chenet! (Closes: #521284)
-rwxr-xr-xcmdline/apt-mark7
-rw-r--r--debian/changelog2
2 files changed, 6 insertions, 3 deletions
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 1bd34e522..0cfb5ff30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -64,6 +64,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)
* methods/http{,s}.cc
- add config setting for User-Agent to the Acquire group,
thanks Timothy J. Miller! (Closes: #355782)