diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2004-12-15 02:17:35 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2004-12-15 02:17:35 +0000 |
| commit | 24867db2060bc6e4def7c9c87dc211cce1514251 (patch) | |
| tree | 47b2eda71544dfdc202d6ed2b09fc4498ca31af5 | |
| parent | 861d7b3e1f54caaa5b836e20df59ca95b2aaf646 (diff) | |
| download | bcfg2-24867db2060bc6e4def7c9c87dc211cce1514251.tar.gz bcfg2-24867db2060bc6e4def7c9c87dc211cce1514251.tar.bz2 bcfg2-24867db2060bc6e4def7c9c87dc211cce1514251.zip | |
add error handling
(Logical change 1.160)
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@714 ce84e21b-d406-0410-9b95-82705330c041
| -rw-r--r-- | src/lib/Server/Generators/Account.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/lib/Server/Generators/Account.py b/src/lib/Server/Generators/Account.py index afbefd29c..8b1facbac 100644 --- a/src/lib/Server/Generators/Account.py +++ b/src/lib/Server/Generators/Account.py @@ -1,7 +1,7 @@ '''This handles authentication setup''' __revision__ = '$Revision$' -from Bcfg2.Server.Generator import Generator, DirectoryBacked +from Bcfg2.Server.Generator import Generator, GeneratorInitError, DirectoryBacked class Account(Generator): '''This module generates account config files, @@ -19,8 +19,12 @@ class Account(Generator): def __init__(self, core, datastore): Generator.__init__(self, core, datastore) - self.repository = DirectoryBacked(self.data) - self.ssh = DirectoryBacked("%s/ssh"%(self.data)) + try: + self.repository = DirectoryBacked(self.data, self.core.fam) + self.ssh = DirectoryBacked("%s/ssh"%(self.data), self.core.fam) + except: + self.LogError("Failed to load repos: %s, %s" % (self.data, "%s/ssh" % (self.data))) + raise GeneratorInitError self.__provides__['ConfigFile'] = {'/etc/passwd':self.from_yp, '/etc/group':self.from_yp, '/etc/security/limits.conf':self.gen_limits, |