diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-09-17 10:31:38 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-09-20 11:37:55 -0400 |
| commit | 1587dcb17c310d5ffb22bd7060c1cf18696eba28 (patch) | |
| tree | 76105afb0a1fc7657d884939cd65c5ca4d9dc962 /src/lib/Bcfg2/Server/Plugins/Packages/Source.py | |
| parent | af07f60e2e5c9c26ab1ef1d0ecc0565672a85f56 (diff) | |
| download | bcfg2-1587dcb17c310d5ffb22bd7060c1cf18696eba28.tar.gz bcfg2-1587dcb17c310d5ffb22bd7060c1cf18696eba28.tar.bz2 bcfg2-1587dcb17c310d5ffb22bd7060c1cf18696eba28.zip | |
development docs for Packages: Collection docs written
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Packages/Source.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Packages/Source.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Source.py b/src/lib/Bcfg2/Server/Plugins/Packages/Source.py index 710d10dd6..1e1aaade1 100644 --- a/src/lib/Bcfg2/Server/Plugins/Packages/Source.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/Source.py @@ -4,12 +4,8 @@ import sys import Bcfg2.Server.Plugin from Bcfg2.Compat import HTTPError, HTTPBasicAuthHandler, \ HTTPPasswordMgrWithDefaultRealm, install_opener, build_opener, \ - urlopen, cPickle + urlopen, cPickle, md5 -try: - from hashlib import md5 -except ImportError: - from md5 import md5 def fetch_url(url): if '@' in url: @@ -66,7 +62,8 @@ class Source(Bcfg2.Server.Plugin.Debuggable): self.gpgkeys = [el.text for el in xsource.findall("GPGKey")] self.essential = xsource.get('essential', 'true').lower() == 'true' - self.recommended = xsource.get('recommended', 'false').lower() == 'true' + self.recommended = xsource.get('recommended', + 'false').lower() == 'true' self.rawurl = xsource.get('rawurl', '') if self.rawurl and not self.rawurl.endswith("/"): @@ -79,7 +76,7 @@ class Source(Bcfg2.Server.Plugin.Debuggable): # build the set of conditions to see if this source applies to # a given set of metadata self.conditions = [] - self.groups = [] # provided for some limited backwards compat + self.groups = [] # provided for some limited backwards compat for el in xsource.iterancestors(): if el.tag == "Group": if el.get("negate", "false").lower() == "true": |