diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2009-12-10 21:45:31 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2009-12-10 21:45:31 +0100 |
| commit | 3f35be50ee4cb425b08139d4ccf5b54d527fe700 (patch) | |
| tree | 6f68dd569ae65945119884142fff3b081aba05f6 | |
| parent | 8b8fdb116138b3adea3ce3c1fd51b3016902c8a5 (diff) | |
| download | apt-3f35be50ee4cb425b08139d4ccf5b54d527fe700.tar.gz | |
merged -r 1918..1919 from lp:~donkult/apt/sid
| -rwxr-xr-x | cmdline/apt-mark | 7 | ||||
| -rw-r--r-- | debian/changelog | 2 |
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 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: |