Remove unused version argument.

This commit is contained in:
Brad Warren
2017-08-04 10:25:09 -07:00
parent 49cdfcec06
commit a66500ea38
+3 -10
View File
@@ -25,8 +25,7 @@ class Installer(plugins_common.Plugin):
def __init__(self, def __init__(self,
policy_config, policy_config,
postfix_dir, postfix_dir,
fixup=False, fixup=False):
version=None):
self.fixup = fixup self.fixup = fixup
self.postfix_dir = postfix_dir self.postfix_dir = postfix_dir
self.policy_config = policy_config self.policy_config = policy_config
@@ -43,9 +42,6 @@ class Installer(plugins_common.Plugin):
self.policy_lines = [] self.policy_lines = []
self.new_cf = "" self.new_cf = ""
# Set in .prepare() unless running in a test
self.postfix_version = version
def find_postfix_cf(self): def find_postfix_cf(self):
"Search far and wide for the correct postfix configuration file" "Search far and wide for the correct postfix configuration file"
return os.path.join(self.postfix_dir, "main.cf") return os.path.join(self.postfix_dir, "main.cf")
@@ -187,10 +183,7 @@ class Installer(plugins_common.Plugin):
""" """
# XXX ensure we raise the right kinds of exceptions # XXX ensure we raise the right kinds of exceptions
if not self.postfix_version: if self.get_version() < (2, 11, 0):
self.postfix_version = self.get_version()
if self.postfix_version < (2, 11, 0):
raise errors.NotSupportedError('Postfix version is too old') raise errors.NotSupportedError('Postfix version is too old')
# Postfix has changed support for TLS features, supported protocol versions # Postfix has changed support for TLS features, supported protocol versions
@@ -273,7 +266,7 @@ class Installer(plugins_common.Plugin):
"Version: {version}".format( "Version: {version}".format(
os.linesep, os.linesep,
root=self.postfix_dir, root=self.postfix_dir,
version='.'.join([str(i) for i in self.postfix_version])) version='.'.join([str(i) for i in self.get_version()]))
) )