diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2012-03-23 10:51:32 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2012-03-23 10:51:32 -0500 |
| commit | 3063e41f480a6143b42a0eff6e4ca17bbfc0d1db (patch) | |
| tree | 204e6b486ab7c7a8f9c29ad3ec77a4e344272098 /src/lib/Server/Plugins/Pkgmgr.py | |
| parent | 397c17ffc5755d2b41ccfa01225d4f42cb9545c1 (diff) | |
| parent | 746293b2f242c099037aac19f14f65e68d036270 (diff) | |
| download | bcfg2-3063e41f480a6143b42a0eff6e4ca17bbfc0d1db.tar.gz bcfg2-3063e41f480a6143b42a0eff6e4ca17bbfc0d1db.tar.bz2 bcfg2-3063e41f480a6143b42a0eff6e4ca17bbfc0d1db.zip | |
Merge branch 'maint'
Diffstat (limited to 'src/lib/Server/Plugins/Pkgmgr.py')
| -rw-r--r-- | src/lib/Server/Plugins/Pkgmgr.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/Server/Plugins/Pkgmgr.py b/src/lib/Server/Plugins/Pkgmgr.py index 5a2106ea6..e9254cdcc 100644 --- a/src/lib/Server/Plugins/Pkgmgr.py +++ b/src/lib/Server/Plugins/Pkgmgr.py @@ -4,7 +4,10 @@ import logging import re import Bcfg2.Server.Plugin import lxml -from sets import Set +try: + set +except NameError: + from sets import Set as set logger = logging.getLogger('Bcfg2.Plugins.Pkgmgr') @@ -63,7 +66,7 @@ class PNode(Bcfg2.Server.Plugin.INode): if 'Package' not in pdict: pdict['Package'] = set() for child in data.getchildren(): - attrs = Set(data.attrib.keys()).difference(child.attrib.keys() + ['name']) + attrs = set(data.attrib.keys()).difference(child.attrib.keys() + ['name']) for attr in attrs: try: child.set(attr, data.get(attr)) |