From 8b8fdb116138b3adea3ce3c1fd51b3016902c8a5 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 10 Dec 2009 21:43:34 +0100 Subject: merged -r 1914..1915 from lp:~donkult/apt/sid --- cmdline/apt-mark | 8 ++++++-- debian/changelog | 3 +++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/cmdline/apt-mark b/cmdline/apt-mark index 226d2079b..c44ce7038 100755 --- 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 5830b8ad5..679753cfb 100644 --- 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: -- cgit v1.2.3