From ceda17612f4fa2037c80eddcaa6696cb30f7ad01 Mon Sep 17 00:00:00 2001 From: Alexander Bersenev Date: Sun, 21 Aug 2011 22:03:33 +0000 Subject: python 2.6 compatibility --- portage_with_autodep/pym/_emerge/EventsAnalyser.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/portage_with_autodep/pym/_emerge/EventsAnalyser.py b/portage_with_autodep/pym/_emerge/EventsAnalyser.py index eb2c943..a0562aa 100644 --- a/portage_with_autodep/pym/_emerge/EventsAnalyser.py +++ b/portage_with_autodep/pym/_emerge/EventsAnalyser.py @@ -267,21 +267,21 @@ class FilterProcGenerator: system_packages=portageutils.get_system_packages_list() - allfiles=GentoolkitUtils.get_all_packages_files() + allfiles=GentoolkitUtils().get_all_packages_files() portage.util.writemsg("All files list recieved, waiting for " \ "a list of allowed files\n") allowedpkgs=system_packages+list(deps_portage)+list(deps_all) - allowedfiles=GentoolkitUtils.getfilesbypackages(allowedpkgs) + allowedfiles=GentoolkitUtils().getfilesbypackages(allowedpkgs) #for pkg in allowedpkgs: # allowedfiles+=GentoolkitUtils.getfilesbypackage(pkg) #import pdb; pdb.set_trace() # manually add all python interpreters to this list - allowedfiles+=GentoolkitUtils.getfilesbypackages(['python']) + allowedfiles+=GentoolkitUtils().getfilesbypackages(['python']) allowedfiles=set(allowedfiles) deniedfiles=allfiles-allowedfiles @@ -318,7 +318,7 @@ class EventsAnalyser: filenames=filenames.union(fail_events) filenames=list(filenames) - file_to_package=GentoolkitUtils.getpackagesbyfiles(filenames) + file_to_package=GentoolkitUtils().getpackagesbyfiles(filenames) # This part is completly unreadable. # It converting one complex struct(returned by getfsevents) to another complex # struct which good for generating output. -- cgit v1.2.3-65-gdbad