Просмотр исходного кода

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

David Kalnischkies лет назад: 16
Родитель
Сommit
32e994d9c8
2 измененных файлов с 6 добавлено и 3 удалено
  1. 4 3
      cmdline/apt-mark
  2. 2 0
      debian/changelog

+ 4 - 3
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

+ 2 - 0
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)