diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2009-02-02 21:54:05 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2009-02-02 21:54:05 +0000 |
| commit | 18a6c84ac353eee6e4ae6970a50b20c7e340c9de (patch) | |
| tree | 5dd7fc87bc78fa2cbf12b0ab6c9f902afc2d1d2d | |
| parent | fda7aa236eed82bae5f4a8b424966c80c75d7182 (diff) | |
| download | bcfg2-18a6c84ac353eee6e4ae6970a50b20c7e340c9de.tar.gz bcfg2-18a6c84ac353eee6e4ae6970a50b20c7e340c9de.tar.bz2 bcfg2-18a6c84ac353eee6e4ae6970a50b20c7e340c9de.zip | |
revert last patch
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5060 ce84e21b-d406-0410-9b95-82705330c041
| -rw-r--r-- | src/lib/Server/Plugins/Metadata.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/lib/Server/Plugins/Metadata.py b/src/lib/Server/Plugins/Metadata.py index f6803b5ba..f63e2d558 100644 --- a/src/lib/Server/Plugins/Metadata.py +++ b/src/lib/Server/Plugins/Metadata.py @@ -15,7 +15,7 @@ class MetadataRuntimeError(Exception): class ClientMetadata(object): '''This object contains client metadata''' def __init__(self, client, profile, groups, bundles, categories, uuid, - password, overall, aliases): + password, overall): self.hostname = client self.profile = profile self.bundles = bundles @@ -23,7 +23,6 @@ class ClientMetadata(object): self.categories = categories self.uuid = uuid self.password = password - self.aliases = aliases self.all = overall self.connectors = [] @@ -373,7 +372,6 @@ class Metadata(Bcfg2.Server.Plugin.Plugin, newbundles = bundles[:] newcategories = {} newcategories.update(categories) - aliases = [key for key, value in self.aliases.iteritems() if value == client] if client in self.passwords: password = self.passwords[client] else: @@ -395,7 +393,7 @@ class Metadata(Bcfg2.Server.Plugin.Plugin, clientscopy = copy.deepcopy(self.clients) return ClientMetadata(client, profile, newgroups, newbundles, newcategories, uuid, password, - (groupscopy, clientscopy), aliases) + (groupscopy, clientscopy)) def merge_additional_groups(self, imd, groups): for group in groups: |