diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Server/Plugin.py | 2 | ||||
| -rw-r--r-- | src/lib/Server/Plugins/Account.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/Server/Plugin.py b/src/lib/Server/Plugin.py index 72052e7ac..7139d21ab 100644 --- a/src/lib/Server/Plugin.py +++ b/src/lib/Server/Plugin.py @@ -112,7 +112,7 @@ class DirectoryBacked(object): elif self.entries.has_key(name): syslog(LOG_INFO, "got multiple adds for %s" % name) else: - if ((name[-1] == '~') or (name[:2] == '.#') or (name == 'SCCS') or (name[-4:] == '.swp')): + if ((name[-1] == '~') or (name[:2] == '.#') or (name[-4:] == '.swp') or (name in ['SCCS', '.svn'])): return self.entries[name] = self.__child__('%s/%s' % (self.name, name)) self.entries[name].HandleEvent() diff --git a/src/lib/Server/Plugins/Account.py b/src/lib/Server/Plugins/Account.py index bd902fa0b..5d2853e9e 100644 --- a/src/lib/Server/Plugins/Account.py +++ b/src/lib/Server/Plugins/Account.py @@ -54,6 +54,6 @@ class Account(Plugin): rootlike = [line.split(':', 1) for line in self.repository.entries['rootlike'].data.split()] superusers += [user for (user, host) in rootlike if host == metadata.hostname.split('.')[0]] rdata = self.repository.entries - entry.text = "".join([rdata["%s.key" % user] for user in superusers if rdata.has_key("%s.key" % user)]) + entry.text = "".join([rdata["%s.key" % user].data for user in superusers if rdata.has_key("%s.key" % user)]) perms = {'owner':'root', 'group':'root', 'perms':'0600'} [entry.attrib.__setitem__(key, value) for (key, value) in perms.iteritems()] |