Fixed formatting of bad-header and retrieve-error settings in output.

[~andy/fetchmail] / fetchmailconf.py

diff --git a/fetchmailconf.py b/fetchmailconf.py
index aa224226257e18090438186c6dd79c0b848dd828..39ccbfc76457f7b307892f1c1410c78cd413f74b 100755 (executable)
--- a/fetchmailconf.py
+++ b/fetchmailconf.py
@@ -202,13 +202,17 @@ class Server:
            res = res + " esmtppassword " + `self.esmtppassword`
        if self.interface or self.monitor or self.principal or self.plugin or self.plugout:
            if folded:
-               res = res + "\n"
+               res = res + "\n    "
+
        if self.badheader:
                res = res + "bad-header accept "
        if self.retrieveerror == 'continue':
                res = res + "retrieve-error continue "
        if self.retrieveerror == 'markseen':
                res = res + "retrieve-error markseen "
+       if self.badheader or self.retrieveerror != ServerDefaults.retrieveerror:
+           if folded:
+               res = res + "\n"
 
        if res[-1] == " ": res = res[0:-1]