diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2015-02-24 16:29:07 -0600 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2015-02-25 07:59:49 -0600 |
| commit | cae39b746051ff5f3257342d0659340283b2d6ef (patch) | |
| tree | 15754ec473e088b52cc8afc4d9ecaf8ee8d7ca2d /src/lib/Bcfg2/Client/Tools/MacPorts.py | |
| parent | 78cac1d0a6923ebc73ff221f8501885c36c112c1 (diff) | |
| download | bcfg2-cae39b746051ff5f3257342d0659340283b2d6ef.tar.gz bcfg2-cae39b746051ff5f3257342d0659340283b2d6ef.tar.bz2 bcfg2-cae39b746051ff5f3257342d0659340283b2d6ef.zip | |
Fix pylint errors
This also pins pylint to <= 0.28 so we don't have to keep playing
whack-a-mole with it.
Also removes unnecessary suppression of apt warnings. This is no
longer necessary in 12.04, so should be safe to remove. If you're on
Ubuntu < 12.04, upgrade for heaven's sake.
Diffstat (limited to 'src/lib/Bcfg2/Client/Tools/MacPorts.py')
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/MacPorts.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/MacPorts.py b/src/lib/Bcfg2/Client/Tools/MacPorts.py index 40d90eec9..116b24687 100644 --- a/src/lib/Bcfg2/Client/Tools/MacPorts.py +++ b/src/lib/Bcfg2/Client/Tools/MacPorts.py @@ -42,10 +42,9 @@ class MacPorts(Bcfg2.Client.Tools.PkgTool): return False if entry.attrib['name'] in self.installed: - if (self.installed[entry.attrib['name']] == entry.attrib['version'] - or entry.attrib['version'] == 'any'): - # if (not self.setup['quick'] and - # entry.get('verify', 'true') == 'true'): + if (entry.attrib['version'] == 'any' or + self.installed[entry.attrib['name']] == + entry.attrib['version']): # FIXME: We should be able to check this once # http://trac.macports.org/ticket/15709 is implemented return True |