Close debian bug that clobbered .fetchmailorc.

svn path=/trunk/; revision=3407

3 files changed, 13 insertions, 3 deletions

diff --git a/NEWS b/NEWS
index 34ab51ab..aa6f8a5f 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,11 @@
 
 (The `lines' figures total .c, .h, .l, and .y files under version control.)
 
+* Correction for backslash-handling patch in rfc822.c.
+* Fix for Debian bug Bug#1038222: fetchmail conf fails to write file 
+  after configuration; move .fetchmailrc to .fetchmailrc.bak before
+  overwriting.
+
 fetchmail-5.8.12 (Fri Jul  6 00:56:02 EDT 2001), 21052 lines:
 
 * Don't depend on having snprintf available.
diff --git a/conf.c b/conf.c
index 16a67c00..b969e15c 100644
--- a/conf.c
+++ b/conf.c
@@ -94,7 +94,7 @@ static void listdump(const char *name, struct idlist *list)
     fprintf(stdout, "\"%s\":", name);
 
     if (!list)
-	fputs("None,\n", stdout);
+	fputs("[],\n", stdout);
     else
     {
 	struct idlist *idp;
diff --git a/fetchmailconf b/fetchmailconf
index b993c7c6..fc4613c2 100755
--- a/fetchmailconf
+++ b/fetchmailconf
@@ -4,7 +4,7 @@
 # by Eric S. Raymond, <esr@snark.thyrsus.com>.
 # Requires Python with Tkinter, and the following OS-dependent services:
 #       posix, posixpath, socket
-version = "1.37"
+version = "1.38"
 
 from Tkinter import *
 from Dialog import *
@@ -364,7 +364,8 @@ class User:
             for x in trimmed:
                 res = res + " " + x
                 res = res + "\n"
-        trimmed = self.fetchdomains;
+        trimmed = self.fetchdomains
+        print "FOO!", `trimmed`
         if trimmed != [] and trimmed[len(trimmed) - 1] == hostname:
             trimmed = trimmed[0:len(trimmed) - 1]
         if trimmed != []:
@@ -833,6 +834,10 @@ class ConfigurationEdit(Frame, MyWidget):
                  bitmap = 'question',
                  strings = ('Yes', 'No'),
                  default = 1).num == 0:
+            try:
+                os.rename(self.outfile, self.outfile + "~")
+            except OSError:
+                pass
             fm = open(self.outfile, 'w')
         if fm:
             fm.write("# Configuration created %s by fetchmailconf\n" % time.ctime(time.time()))