summaryrefslogtreecommitdiff
path: root/cmdline/apt-mark
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2010-03-14 16:47:48 +0100
committerDavid Kalnischkies <kalnischkies@gmail.com>2010-03-14 16:47:48 +0100
commita7307a8727c85b0166339a54fb14ba3812f7a608 (patch)
treee576e87289b2fbf4f3f421c0b5495636eb6992b0 /cmdline/apt-mark
parentea5624c3d04c35f5a269b6f7431c135330c9b9b5 (diff)
parentb14f32f9b8c406706fd7735ffb13ae5c377baefe (diff)
merge with debian-sid, update-po for manpages and fix a few more
typos in doc/po/es.po to generate the manpages properly. [ Christian Perrier ] * German translation update. Closes: #571037 * Spanish manpages translation update. Closes: #573293 [ Julian Andres Klode ] * cmdline/apt-mark: - Use the new python-apt API (and conflict with python-apt << 0.7.93.2). * apt-inst/contrib/arfile.h: - Add public ARArchive::Members() which returns the list of members. * debian/rules: - Fix the libraries name to be e.g. libapt-pkg4.9 instead of libapt-pkg-4.9.
Diffstat (limited to 'cmdline/apt-mark')
-rwxr-xr-xcmdline/apt-mark22
1 files changed, 11 insertions, 11 deletions
diff --git a/cmdline/apt-mark b/cmdline/apt-mark
index f4f6aa576..18552177c 100755
--- a/cmdline/apt-mark
+++ b/cmdline/apt-mark
@@ -19,10 +19,10 @@ def show_automatic(filename):
if not os.path.exists(STATE_FILE):
return
auto = set()
- tagfile = apt_pkg.ParseTagFile(open(STATE_FILE))
- while tagfile.Step():
- pkgname = tagfile.Section.get("Package")
- autoInst = tagfile.Section.get("Auto-Installed")
+ tagfile = apt_pkg.TagFile(open(STATE_FILE))
+ for section in tagfile:
+ pkgname = section.get("Package")
+ autoInst = section.get("Auto-Installed")
if int(autoInst):
auto.add(pkgname)
print "\n".join(sorted(auto))
@@ -33,24 +33,24 @@ def mark_unmark_automatic(filename, action, pkgs):
# open the statefile
if os.path.exists(STATE_FILE):
try:
- tagfile = apt_pkg.ParseTagFile(open(STATE_FILE))
+ tagfile = apt_pkg.TagFile(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")
+ for section in tagfile:
+ pkgname = section.get("Package")
+ autoInst = section.get("Auto-Installed")
if pkgname in pkgs:
if options.verbose:
print "changing %s to %s" % (pkgname,action)
- newsec = apt_pkg.RewriteSection(tagfile.Section,
+ newsec = apt_pkg.rewrite_section(section,
[],
[ ("Auto-Installed",str(action)) ])
pkgs.remove(pkgname)
outfile.write(newsec+"\n")
else:
- outfile.write(str(tagfile.Section)+"\n")
+ outfile.write(str(section)+"\n")
if action == 1:
for pkgname in pkgs:
if options.verbose:
@@ -82,7 +82,7 @@ if __name__ == "__main__":
# get the state-file
if not options.filename:
- STATE_FILE = apt_pkg.Config.FindDir("Dir::State") + "extended_states"
+ STATE_FILE = apt_pkg.config.find_dir("Dir::State") + "extended_states"
else:
STATE_FILE=options.filename