And this should get rid of suddenly empty prod editors. I hope.

[dak.git] / dak / process_new.py

diff --git a/dak/process_new.py b/dak/process_new.py
index c33b3d36bc6533561d465d3486a1bf112b18fcbd..02f1b8bcd7e73145e13ccf846c274e981fcdbb03 100755 (executable)
--- a/dak/process_new.py
+++ b/dak/process_new.py
@@ -581,9 +581,9 @@ def prod_maintainer (note):
     answer = 'E'
     while answer == 'E':
         os.system("%s %s" % (editor, temp_filename))
-        f = os.fdopen(fd)
-        prod_message = "".join(f.readlines())
-        f.close()
+        temp_fh = utils.open_file(temp_filename)
+        prod_message = "".join(temp_fh.readlines())
+        temp_fh.close()
         print "Prod message:"
         print utils.prefix_multi_line_string(prod_message,"  ",include_blank_lines=1)
         prompt = "[P]rod, Edit, Abandon, Quit ?"
@@ -594,12 +594,12 @@ def prod_maintainer (note):
             if answer == "":
                 answer = m.group(1)
             answer = answer[:1].upper()
-        os.unlink(temp_filename)
-        if answer == 'A':
-            return
-        elif answer == 'Q':
-            end()
-            sys.exit(0)
+    os.unlink(temp_filename)
+    if answer == 'A':
+        return
+    elif answer == 'Q':
+        end()
+        sys.exit(0)
     # Otherwise, do the proding...
     user_email_address = utils.whoami() + " <%s>" % (
         Cnf["Dinstall::MyAdminAddress"])