diff options
| -rw-r--r-- | pym/portage/env/config.py | 12 | ||||
| -rw-r--r-- | pym/portage/env/loaders.py | 14 |
2 files changed, 15 insertions, 11 deletions
diff --git a/pym/portage/env/config.py b/pym/portage/env/config.py index 62d3d8177..192d10852 100644 --- a/pym/portage/env/config.py +++ b/pym/portage/env/config.py @@ -38,7 +38,8 @@ class PackageKeywordsFile(UserConfigKlass): default_loader = KeyListFileLoader def __init__(self, filename): - super(PackageKeywordsFile,self).__init__(self.default_loader(filename)) + super(PackageKeywordsFile, self).__init__( + self.default_loader(filename, validator=None)) class PackageUseFile(UserConfigKlass): """ @@ -47,7 +48,8 @@ class PackageUseFile(UserConfigKlass): default_loader = KeyListFileLoader def __init__(self, filename): - super(PackageUseFile,self).__init__(self.default_loader(filename)) + super(PackageUseFile, self).__init__( + self.default_loader(filename, validator=None)) class PackageMaskFile(UserConfigKlass): """ @@ -64,7 +66,8 @@ class PackageMaskFile(UserConfigKlass): default_loader = ItemFileLoader def __init__(self, filename): - super(PackageMaskFile,self).__init__(self.default_loader(filename)) + super(PackageMaskFile, self).__init__( + self.default_loader(filename, validator=None)) class PortageModulesFile(UserConfigKlass): """ @@ -74,4 +77,5 @@ class PortageModulesFile(UserConfigKlass): default_loader = KeyValuePairFileLoader def __init__(self, filename): - super(PortageModulesFile,self).__init__(self.default_loader(filename)) + super(PortageModulesFile, self).__init__( + self.default_loader(filename, validator=None)) diff --git a/pym/portage/env/loaders.py b/pym/portage/env/loaders.py index c9fb7473d..f670345a5 100644 --- a/pym/portage/env/loaders.py +++ b/pym/portage/env/loaders.py @@ -28,7 +28,7 @@ def RecursiveFileLoader(filename): full of files in that directory to process. Ignore files beginning with . or ending in ~. - Prune CVS directories. + Prune CVS directories. @param filename: name of a file/directory to traverse @rtype: list @@ -81,8 +81,8 @@ class ItemFileLoader(DataLoader): _recursive = False - def __init__(self, filename): - DataLoader.__init__(self) + def __init__(self, filename, validator): + DataLoader.__init__(self, validator) self.fname = filename def load(self): @@ -118,8 +118,8 @@ class KeyListFileLoader(DataLoader): _recursive = False - def __init__(self, filename): - DataLoader.__init__(self) + def __init__(self, filename, validator): + DataLoader.__init__(self, validator) self.fname = filename def load(self): @@ -162,8 +162,8 @@ class KeyValuePairFileLoader(DataLoader): _recursive = False - def __init__(self, filename): - DataLoader.__init__(self) + def __init__(self, filename, validator): + DataLoader.__init__(self, validator) self.fname = filename def load(self): |