diff options
| -rw-r--r-- | doc/examples/acquire.py | 41 | ||||
| -rw-r--r-- | doc/examples/action.py | 132 | ||||
| -rw-r--r-- | doc/examples/all_deps.py | 14 | ||||
| -rwxr-xr-x | doc/examples/build-deps-old.py | 32 | ||||
| -rwxr-xr-x | doc/examples/build-deps.py | 14 | ||||
| -rw-r--r-- | doc/examples/cdrom.py | 6 | ||||
| -rwxr-xr-x | doc/examples/checkstate.py | 18 | ||||
| -rwxr-xr-x | doc/examples/config.py | 18 | ||||
| -rwxr-xr-x | doc/examples/configisc.py | 22 | ||||
| -rwxr-xr-x | doc/examples/deb_inspect.py | 14 |
10 files changed, 156 insertions, 155 deletions
diff --git a/doc/examples/acquire.py b/doc/examples/acquire.py index 96426a32..ec6f6576 100644 --- a/doc/examples/acquire.py +++ b/doc/examples/acquire.py @@ -1,5 +1,6 @@ #!/usr/bin/python import apt +import apt.progress.text import apt_pkg import os @@ -8,8 +9,8 @@ def get_file(fetcher, uri, destfile): # get the file af = apt_pkg.AcquireFile(fetcher, uri=uri, descr="sample descr", destfile=destfile) - res = fetcher.Run() - if res != fetcher.ResultContinue: + res = fetcher.run() + if res != fetcher.RESULT_CONTINUE: return False return True @@ -24,30 +25,30 @@ depcache = apt_pkg.DepCache(cache) recs = apt_pkg.PackageRecords(cache) list = apt_pkg.SourceList() -list.ReadMainList() +list.read_main_list() # show the amount fetch needed for a dist-upgrade -depcache.Upgrade(True) -progress = apt.progress.TextFetchProgress() +depcache.upgrade(True) +progress = apt.progress.text.AcquireProgress() fetcher = apt_pkg.Acquire(progress) pm = apt_pkg.PackageManager(depcache) -pm.GetArchives(fetcher, list, recs) -print "%s (%s)" % (apt_pkg.SizeToStr(fetcher.FetchNeeded), fetcher.FetchNeeded) +pm.get_archives(fetcher, list, recs) +print "%s (%s)" % (apt_pkg.size_to_str(fetcher.fetch_needed), fetcher.fetch_needed) actiongroup = apt_pkg.ActionGroup(depcache) -for pkg in cache.Packages: - depcache.MarkKeep(pkg) +for pkg in cache.packages: + depcache.mark_keep(pkg) try: os.mkdir("/tmp/pyapt-test") os.mkdir("/tmp/pyapt-test/partial") except OSError: pass -apt_pkg.Config.Set("Dir::Cache::archives", "/tmp/pyapt-test") +apt_pkg.config.set("Dir::Cache::archives", "/tmp/pyapt-test") pkg = cache["3ddesktop"] -depcache.MarkInstall(pkg) +depcache.mark_install(pkg) -progress = apt.progress.TextFetchProgress() +progress = apt.progress.text.AcquireProgress() fetcher = apt_pkg.Acquire(progress) #fetcher = apt_pkg.Acquire() pm = apt_pkg.PackageManager(depcache) @@ -57,20 +58,20 @@ print fetcher get_file(fetcher, "ftp://ftp.debian.org/debian/dists/README", "/tmp/lala") -pm.GetArchives(fetcher, list, recs) +pm.get_archives(fetcher, list, recs) -for item in fetcher.Items: +for item in fetcher.items: print item - if item.Status == item.StatError: - print "Some error ocured: '%s'" % item.ErrorText - if item.Complete == False: - print "No error, still nothing downloaded (%s)" % item.ErrorText + if item.status == item.STAT_ERROR: + print "Some error ocured: '%s'" % item.error_text + if item.complete == False: + print "No error, still nothing downloaded (%s)" % item.error_text print -res = fetcher.Run() +res = fetcher.run() print "fetcher.Run() returned: %s" % res print "now runing pm.DoInstall()" -res = pm.DoInstall(1) +res = pm.do_install(1) print "pm.DoInstall() returned: %s"% res diff --git a/doc/examples/action.py b/doc/examples/action.py index 512945df..0399bddc 100644 --- a/doc/examples/action.py +++ b/doc/examples/action.py @@ -3,19 +3,19 @@ import apt_pkg import sys -from apt.progress import OpTextProgress +from apt.progress.text import OpProgress from progress import TextFetchProgress # init apt_pkg.init() -progress = OpTextProgress() +progress = OpProgress() cache = apt_pkg.Cache(progress) -print "Available packages: %s " % cache.PackageCount +print "Available packages: %s " % cache.package_count print "Fetching" progress = TextFetchProgress() -cache.Update(progress) +cache.update(progress) print "Exiting" sys.exit(0) @@ -26,85 +26,85 @@ print "example package iter: %s" % iter # get depcache print "\n\n depcache" depcache = apt_pkg.DepCache(cache, progress) -depcache.ReadPinFile() +depcache.read_pin_file() print "got a depcache: %s " % depcache -print "Marked for install: %s " % depcache.InstCount +print "Marked for install: %s " % depcache.inst_count print "\n\n Reinit" -depcache.Init(progress) +depcache.init(progress) #sys.exit() # get a canidate version -ver= depcache.GetCandidateVer(iter) +ver= depcache.get_candidate_ver(iter) print "Candidate version: %s " % ver print "\n\nQuerry interface" -print "%s.IsUpgradable(): %s" % (iter.Name, depcache.IsUpgradable(iter)) +print "%s.is_upgradable(): %s" % (iter.name, depcache.is_upgradable(iter)) print "\nMarking interface" -print "Marking '%s' for install" % iter.Name -depcache.MarkInstall(iter) -print "Install count: %s " % depcache.InstCount -print "%s.MarkedInstall(): %s" % (iter.Name, depcache.MarkedInstall(iter)) -print "%s.MarkedUpgrade(): %s" % (iter.Name, depcache.MarkedUpgrade(iter)) -print "%s.MarkedDelete(): %s" % (iter.Name, depcache.MarkedDelete(iter)) - -print "Marking %s for delete" % iter.Name -depcache.MarkDelete(iter) -print "DelCount: %s " % depcache.DelCount -print "%s.MarkedDelete(): %s" % (iter.Name, depcache.MarkedDelete(iter)) +print "Marking '%s' for install" % iter.name +depcache.mark_install(iter) +print "Install count: %s " % depcache.inst_count +print "%s.marked_install(): %s" % (iter.name, depcache.marked_install(iter)) +print "%s.marked_upgrade(): %s" % (iter.name, depcache.marked_upgrade(iter)) +print "%s.marked_delete(): %s" % (iter.name, depcache.marked_delete(iter)) + +print "Marking %s for delete" % iter.name +depcache.mark_delete(iter) +print "del_count: %s " % depcache.del_count +print "%s.marked_delete(): %s" % (iter.name, depcache.marked_delete(iter)) iter = cache["3dchess"] -print "\nMarking '%s' for install" % iter.Name -depcache.MarkInstall(iter) -print "Install count: %s " % depcache.InstCount -print "%s.MarkedInstall(): %s" % (iter.Name, depcache.MarkedInstall(iter)) -print "%s.MarkedUpgrade(): %s" % (iter.Name, depcache.MarkedUpgrade(iter)) -print "%s.MarkedDelete(): %s" % (iter.Name, depcache.MarkedDelete(iter)) +print "\nMarking '%s' for install" % iter.name +depcache.mark_install(iter) +print "Install count: %s " % depcache.inst_count +print "%s.marked_install(): %s" % (iter.name, depcache.marked_install(iter)) +print "%s.marked_upgrade(): %s" % (iter.name, depcache.marked_upgrade(iter)) +print "%s.marked_delete(): %s" % (iter.name, depcache.marked_delete(iter)) -print "Marking %s for keep" % iter.Name -depcache.MarkKeep(iter) -print "Install: %s " % depcache.InstCount +print "Marking %s for keep" % iter.name +depcache.mark_keep(iter) +print "Install: %s " % depcache.inst_count iter = cache["3dwm-server"] -print "\nMarking '%s' for install" % iter.Name -depcache.MarkInstall(iter) -print "Install: %s " % depcache.InstCount -print "Broken count: %s" % depcache.BrokenCount -print "FixBroken() " -depcache.FixBroken() -print "Broken count: %s" % depcache.BrokenCount - -print "\nPerforming Upgrade" -depcache.Upgrade() -print "Keep: %s " % depcache.KeepCount -print "Install: %s " % depcache.InstCount -print "Delete: %s " % depcache.DelCount -print "UsrSize: %s " % apt_pkg.SizeToStr(depcache.UsrSize) -print "DebSize: %s " % apt_pkg.SizeToStr(depcache.DebSize) - -for pkg in cache.Packages: - if pkg.CurrentVer is not None and not depcache.MarkedInstall(pkg) \ - and depcache.IsUpgradable(pkg): - print "Upgrade didn't upgrade (kept): %s" % pkg.Name - -print "\nPerforming DistUpgrade" -depcache.Upgrade(True) -print "Keep: %s " % depcache.KeepCount -print "Install: %s " % depcache.InstCount -print "Delete: %s " % depcache.DelCount -print "UsrSize: %s " % apt_pkg.SizeToStr(depcache.UsrSize) -print "DebSize: %s " % apt_pkg.SizeToStr(depcache.DebSize) +print "\nMarking '%s' for install" % iter.name +depcache.mark_install(iter) +print "Install: %s " % depcache.inst_count +print "Broken count: %s" % depcache.broken_count +print "fix_broken() " +depcache.fix_broken() +print "Broken count: %s" % depcache.broken_count + +print "\nPerforming upgrade" +depcache.upgrade() +print "Keep: %s " % depcache.keep_count +print "Install: %s " % depcache.inst_count +print "Delete: %s " % depcache.del_count +print "usr_size: %s " % apt_pkg.size_to_str(depcache.usr_size) +print "deb_size: %s " % apt_pkg.size_to_str(depcache.deb_size) + +for pkg in cache.packages: + if pkg.current_ver is not None and not depcache.marked_install(pkg) \ + and depcache.is_upgradable(pkg): + print "upgrade didn't upgrade (kept): %s" % pkg.name + +print "\nPerforming Distupgrade" +depcache.upgrade(True) +print "Keep: %s " % depcache.keep_count +print "Install: %s " % depcache.inst_count +print "Delete: %s " % depcache.del_count +print "usr_size: %s " % apt_pkg.size_to_str(depcache.usr_size) +print "deb_size: %s " % apt_pkg.size_to_str(depcache.deb_size) # overview about what would happen -for pkg in cache.Packages: - if depcache.MarkedInstall(pkg): - if pkg.CurrentVer is not None: - print "Marked upgrade: %s " % pkg.Name +for pkg in cache.packages: + if depcache.marked_install(pkg): + if pkg.current_ver is not None: + print "Marked upgrade: %s " % pkg.name else: - print "Marked install: %s" % pkg.Name - elif depcache.MarkedDelete(pkg): - print "Marked delete: %s" % pkg.Name - elif depcache.MarkedKeep(pkg): - print "Marked keep: %s" % pkg.Name + print "Marked install: %s" % pkg.name + elif depcache.marked_delete(pkg): + print "Marked delete: %s" % pkg.name + elif depcache.marked_keep(pkg): + print "Marked keep: %s" % pkg.name diff --git a/doc/examples/all_deps.py b/doc/examples/all_deps.py index 992e98d8..179501f4 100644 --- a/doc/examples/all_deps.py +++ b/doc/examples/all_deps.py @@ -6,19 +6,19 @@ import apt def dependencies(cache, pkg, deps, key="Depends"): #print "pkg: %s (%s)" % (pkg.name, deps) - candver = cache._depcache.GetCandidateVer(pkg._pkg) + candver = cache._depcache.get_candidate_ver(pkg._pkg) if candver is None: return deps - dependslist = candver.DependsList + dependslist = candver.depends_list if key in dependslist: for depVerList in dependslist[key]: for dep in depVerList: - if dep.TargetPkg.Name in cache: - if pkg.name != dep.TargetPkg.Name and \ - not dep.TargetPkg.Name in deps: - deps.add(dep.TargetPkg.Name) + if dep.target_pkg.name in cache: + if pkg.name != dep.target_pkg.name and \ + not dep.target_pkg.name in deps: + deps.add(dep.target_pkg.name) dependencies( - cache, cache[dep.TargetPkg.Name], deps, key) + cache, cache[dep.target_pkg.name], deps, key) return deps diff --git a/doc/examples/build-deps-old.py b/doc/examples/build-deps-old.py index 656f1361..924c6191 100755 --- a/doc/examples/build-deps-old.py +++ b/doc/examples/build-deps-old.py @@ -7,15 +7,15 @@ import sys def get_source_pkg(pkg, records, depcache): """ get the source package name of a given package """ - version = depcache.GetCandidateVer(pkg) + version = depcache.get_candidate_ver(pkg) if not version: return None - file, index = version.FileList.pop(0) - records.Lookup((file, index)) - if records.SourcePkg != "": - srcpkg = records.SourcePkg + file, index = version.file_list.pop(0) + records.lookup((file, index)) + if records.source_pkg != "": + srcpkg = records.source_pkg else: - srcpkg = pkg.Name + srcpkg = pkg.name return srcpkg @@ -23,7 +23,7 @@ def get_source_pkg(pkg, records, depcache): apt_pkg.init() cache = apt_pkg.Cache() depcache = apt_pkg.DepCache(cache) -depcache.Init() +depcache.init() records = apt_pkg.PackageRecords(cache) srcrecords = apt_pkg.SourceRecords() @@ -42,29 +42,29 @@ all_build_depends = set() srcpkg_name = get_source_pkg(base, records, depcache) print "srcpkg_name: %s " % srcpkg_name if not srcpkg_name: - print "Can't find source package for '%s'" % pkg.Name -srcrec = srcrecords.Lookup(srcpkg_name) + print "Can't find source package for '%s'" % pkg.mame +srcrec = srcrecords.lookup(srcpkg_name) if srcrec: print "Files:" - print srcrecords.Files - bd = srcrecords.BuildDepends + print srcrecords.files + bd = srcrecords.build_depends print "build-depends of the package: %s " % bd for b in bd: all_build_depends.add(b[0]) # calculate the build depends for all dependencies -depends = depcache.GetCandidateVer(base).DependsList +depends = depcache.get_candidate_ver(base).depends_list for dep in depends["Depends"]: # FIXME: do we need to consider PreDepends? - pkg = dep[0].TargetPkg + pkg = dep[0].target_pkg srcpkg_name = get_source_pkg(pkg, records, depcache) if not srcpkg_name: - print "Can't find source package for '%s'" % pkg.Name + print "Can't find source package for '%s'" % pkg.name continue - srcrec = srcrecords.Lookup(srcpkg_name) + srcrec = srcrecords.lookup(srcpkg_name) if srcrec: #print srcrecords.Package #print srcrecords.Binaries - bd = srcrecords.BuildDepends + bd = srcrecords.build_depends #print "%s: %s " % (srcpkg_name, bd) for b in bd: all_build_depends.add(b[0]) diff --git a/doc/examples/build-deps.py b/doc/examples/build-deps.py index 5d243943..a189cdfa 100755 --- a/doc/examples/build-deps.py +++ b/doc/examples/build-deps.py @@ -24,12 +24,12 @@ all_build_depends = set() srcpkg_name = base.candidate.source_name print "srcpkg_name: %s " % srcpkg_name if not srcpkg_name: - print "Can't find source package for '%s'" % pkg.Name -srcrec = srcrecords.Lookup(srcpkg_name) + print "Can't find source package for '%s'" % pkg.name +srcrec = srcrecords.lookup(srcpkg_name) if srcrec: print "Files:" - print srcrecords.Files - bd = srcrecords.BuildDepends + print srcrecords.files + bd = srcrecords.build_depends print "build-depends of the package: %s " % bd for b in bd: all_build_depends.add(b[0]) @@ -41,13 +41,13 @@ for or_dep in depends: pkg = cache[dep.name] srcpkg_name = pkg.candidate.source_name if not srcpkg_name: - print "Can't find source package for '%s'" % pkg.Name + print "Can't find source package for '%s'" % pkg.name continue - srcrec = srcrecords.Lookup(srcpkg_name) + srcrec = srcrecords.lookup(srcpkg_name) if srcrec: #print srcrecords.Package #print srcrecords.Binaries - bd = srcrecords.BuildDepends + bd = srcrecords.build_depends #print "%s: %s " % (srcpkg_name, bd) for b in bd: all_build_depends.add(b[0]) diff --git a/doc/examples/cdrom.py b/doc/examples/cdrom.py index 78f2a8af..2fbc8f34 100644 --- a/doc/examples/cdrom.py +++ b/doc/examples/cdrom.py @@ -15,11 +15,11 @@ print cdrom progress = TextCdromProgress() -(res, ident) = cdrom.Ident(progress) +(res, ident) = cdrom.ident(progress) print "ident result is: %s (%s) " % (res, ident) -apt_pkg.Config.Set("APT::CDROM::Rename", "True") -cdrom.Add(progress) +apt_pkg.config["APT::CDROM::Rename"] = "True" +cdrom.add(progress) print "Exiting" sys.exit(0) diff --git a/doc/examples/checkstate.py b/doc/examples/checkstate.py index 41040b6c..7f046c5d 100755 --- a/doc/examples/checkstate.py +++ b/doc/examples/checkstate.py @@ -9,27 +9,27 @@ import apt_pkg apt_pkg.init() cache = apt_pkg.Cache() -packages = cache.Packages +packages = cache.packages uninstalled, updated, upgradable = {}, {}, {} for package in packages: - versions = package.VersionList + versions = package.version_list if not versions: continue version = versions[0] for other_version in versions: - if apt_pkg.VersionCompare(version.VerStr, other_version.VerStr)<0: + if apt_pkg.version_compare(version.ver_str, other_version.ver_str)<0: version = other_version - if package.CurrentVer: - current = package.CurrentVer - if apt_pkg.VersionCompare(current.VerStr, version.VerStr)<0: - upgradable[package.Name] = version + if package.current_ver: + current = package.current_ver + if apt_pkg.version_compare(current.ver_str, version.ver_str)<0: + upgradable[package.name] = version break else: - updated[package.Name] = current + updated[package.name] = current else: - uninstalled[package.Name] = version + uninstalled[package.name] = version for l in (uninstalled, updated, upgradable): diff --git a/doc/examples/config.py b/doc/examples/config.py index 0dff4cac..c364fe16 100755 --- a/doc/examples/config.py +++ b/doc/examples/config.py @@ -26,9 +26,9 @@ Cnf = apt_pkg.Configuration() print "Command line is", sys.argv # Load the default configuration file, InitConfig() does this better.. -Cnf.Set("config-file", "/etc/apt/apt.conf") # or Cnf["config-file"] = ".." -if posixpath.exists(Cnf.FindFile("config-file")): - apt_pkg.ReadConfigFile(Cnf, "/etc/apt/apt.conf") +Cnf.set("config-file", "/etc/apt/apt.conf") # or Cnf["config-file"] = ".." +if posixpath.exists(Cnf.find_file("config-file")): + apt_pkg.read_config_file(Cnf, "/etc/apt/apt.conf") # Merge the command line arguments into the configuration space Arguments = [('h', "help", "help"), @@ -36,17 +36,17 @@ Arguments = [('h', "help", "help"), ('q', "quiet", "quiet", "IntLevel"), ('c', "config-file", "", "ConfigFile"), ('o', "option", "", "ArbItem")] -print "FileNames", apt_pkg.ParseCommandLine(Cnf, Arguments, sys.argv) +print "FileNames", apt_pkg.parse_commandline(Cnf, Arguments, sys.argv) -print "Quiet level selected is", Cnf.FindI("quiet", 0) +print "Quiet level selected is", Cnf.find_i("quiet", 0) # Do some stuff with it -if Cnf.FindB("version", 0) == 1: +if Cnf.find_b("version", 0) == 1: print "Version selected - 1.1" -if Cnf.FindB("help", 0) == 1: - print "python-apt", apt_pkg.Version, \ - "compiled on", apt_pkg.Date, apt_pkg.Time +if Cnf.find_b("help", 0) == 1: + print "python-apt", apt_pkg.VERSION, \ + "compiled on", apt_pkg.DATE, apt_pkg.TIME print "Hi, I am the help text for this program" sys.exit(0) diff --git a/doc/examples/configisc.py b/doc/examples/configisc.py index fe3d161b..fea5893e 100755 --- a/doc/examples/configisc.py +++ b/doc/examples/configisc.py @@ -11,14 +11,14 @@ import apt_pkg import sys -ConfigFile = apt_pkg.ParseCommandLine(apt_pkg.Config, [], sys.argv) +ConfigFile = apt_pkg.parse_commandLine(apt_pkg.config, [], sys.argv) if len(ConfigFile) != 1: print "Must have exactly 1 file name" sys.exit(0) Cnf = apt_pkg.Configuration() -apt_pkg.ReadConfigFileISC(Cnf, ConfigFile[0]) +apt_pkg.read_config_file_isc(Cnf, ConfigFile[0]) # Print the configuration space #print "The Configuration space looks like:" @@ -26,18 +26,18 @@ apt_pkg.ReadConfigFileISC(Cnf, ConfigFile[0]) # print "%s \"%s\";" % (I, Cnf[I]) # bind8 config file.. -if Cnf.Exists("Zone"): - print "Zones: ", Cnf.SubTree("zone").List() - for I in Cnf.List("zone"): - SubCnf = Cnf.SubTree(I) - if SubCnf.Find("type") == "slave": +if "Zone" in Cnf: + print "Zones: ", Cnf.sub_tree("zone").list() + for I in Cnf.list("zone"): + SubCnf = Cnf.sub_tree(I) + if SubCnf.find("type") == "slave": print "Masters for %s: %s" % ( - SubCnf.MyTag(), SubCnf.ValueList("masters")) + SubCnf.my_tag(), SubCnf.value_list("masters")) else: print "Tree definitions:" - for I in Cnf.List("tree"): - SubCnf = Cnf.SubTree(I) + for I in Cnf.list("tree"): + SubCnf = Cnf.sub_tree(I) # This could use Find which would eliminate the possibility of # exceptions. print "Subtree %s with sections '%s' and architectures '%s'" % ( - SubCnf.MyTag(), SubCnf["Sections"], SubCnf["Architectures"]) + SubCnf.my_tag(), SubCnf["Sections"], SubCnf["Architectures"]) diff --git a/doc/examples/deb_inspect.py b/doc/examples/deb_inspect.py index 54c52b7b..3261c734 100755 --- a/doc/examples/deb_inspect.py +++ b/doc/examples/deb_inspect.py @@ -7,10 +7,10 @@ import sys import os.path -def Callback(What, Name, Link, Mode, UID, GID, Size, MTime, Major, Minor): +def Callback(member, data): """ callback for debExtract """ - print "%s '%s','%s',%u,%u,%u,%u,%u,%u,%u" \ - % (What, Name, Link, Mode, UID, GID, Size, MTime, Major, Minor) + print "'%s','%s',%u,%u,%u,%u,%u,%u,%u" \ + % (member.name, member.linkname, member.mode, member.uid, member.gid, member.size, member.mtime, member.major, member.minor) if __name__ == "__main__": @@ -21,10 +21,10 @@ if __name__ == "__main__": print "Working on: %s" % file print "Displaying data.tar.gz:" - apt_inst.debExtract(open(file), Callback, "data.tar.gz") + apt_inst.DebFile(open(file)).data.go(Callback) print "Now extracting the control file:" - control = apt_inst.debExtractControl(open(file)) + control = apt_inst.DebFile(open(file)).control.extractdata("control") sections = apt_pkg.TagSection(control) print "Maintainer is: " @@ -33,13 +33,13 @@ if __name__ == "__main__": print print "DependsOn: " depends = sections["Depends"] - print apt_pkg.ParseDepends(depends) + print apt_pkg.parse_depends(depends) print "extracting archive" dir = "/tmp/deb" os.mkdir(dir) - apt_inst.debExtractArchive(open(file), dir) + apt_inst.DebFile(open(file)).data.extractall(dir) def visit(arg, dirname, names): print "%s/" % dirname |