merged -r 1914..1915 from lp:~donkult/apt/sid

diff --git a/cmdline/apt-mark b/cmdline/apt-mark
index 226d2079b6d6f0bb1603c6d12339cab08988bc43..c44ce7038047380800945c4897a8a27b11ea3362 100755 (executable)
--- a/cmdline/apt-mark
+++ b/cmdline/apt-mark
@@ -31,8 +31,12 @@ def mark_unmark_automatic(filename, action, pkgs):
     " mark or unmark automatic flag"
     # open the statefile
     if os.path.exists(STATE_FILE):
-        tagfile = apt_pkg.ParseTagFile(open(STATE_FILE))
-        outfile = open(STATE_FILE+".tmp","w")
+        try:
+            tagfile = apt_pkg.ParseTagFile(open(STATE_FILE))
+            outfile = open(STATE_FILE+".tmp","w")
+        except IOError, msg:
+            print "%s, are you root?" % (msg)
+            sys.exit(1)
         while tagfile.Step():
             pkgname = tagfile.Section.get("Package")
             autoInst = tagfile.Section.get("Auto-Installed")

diff --git a/debian/changelog b/debian/changelog
index 5830b8ad55bd88ca66af7969d2343fe66363fbb6..679753cfb8d46c4fc48d0b423de70581de2fbe22 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -78,6 +78,9 @@ apt (0.7.25) UNRELEASED; urgency=low
     - bump policy to 3.8.3 as we have no outdated manpages anymore
   * debian/NEWS:
     - fix a typo in 0.7.24: Allready -> Already (Closes: #557674)
+  * cmdline/apt-mark:
+    - print an error if a new state file can't be created,
+      thanks Carl Chenet! (Closes: #521289)
 
   [ Chris Leick ]
   * doc/ various manpages: