Put self.service check back in that got removed, it's still needed.

svn path=/trunk/; revision=4352

diff --git a/fetchmailconf.py b/fetchmailconf.py
index 1faf9b78936ec2776d8750bc70bf7003b1270dd8..571e18fbbc8ba26a9bb25c0765906c9f20e8c8b2 100755 (executable)
--- a/fetchmailconf.py
+++ b/fetchmailconf.py
@@ -132,7 +132,7 @@ class Server:
            res = res + (" via " + str(self.via) + "\n");
        if self.protocol != ServerDefaults.protocol:
            res = res + " with proto " + self.protocol
-       if self.protocol and self.service != defaultports[self.protocol] and defaultports[self.protocol] and self.service != ianaservices[defaultports[self.protocol]]:
+       if self.service and self.protocol and self.service != defaultports[self.protocol] and defaultports[self.protocol] and self.service != ianaservices[defaultports[self.protocol]]:
            res = res + " service " + self.service
        if self.timeout != ServerDefaults.timeout:
            res = res + " timeout " + `self.timeout`