diff options
| -rwxr-xr-x | cmdline/apt-mark | 22 | ||||
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/control | 1 |
3 files changed, 17 insertions, 11 deletions
diff --git a/cmdline/apt-mark b/cmdline/apt-mark index 2326ece38..0e73dda78 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: @@ -78,7 +78,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 diff --git a/debian/changelog b/debian/changelog index c855c77d5..6003477ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,12 @@ apt (0.7.26~exp3) UNRELEASED; urgency=low + [ Christian Perrier ] * German translation update. Closes: #571037 + [ Julian Andres Klode ] + * cmdline/apt-mark: + - Use the new python-apt API (and conflict with python-apt << 0.7.93.2). + -- Christian Perrier <bubulle@debian.org> Wed, 24 Feb 2010 22:13:50 +0100 apt (0.7.26~exp2) experimental; urgency=low diff --git a/debian/control b/debian/control index de2bf6544..c2b6c17a5 100644 --- a/debian/control +++ b/debian/control @@ -14,6 +14,7 @@ Architecture: any Depends: ${shlibs:Depends}, debian-archive-keyring, ${misc:Depends} Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7) Provides: ${libapt-pkg:provides} +Conflicts: python-apt (<< 0.7.93.2~) Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt Description: Advanced front-end for dpkg This is Debian's next generation front-end for the dpkg package manager. |