# 
# 
# patch "ChangeLog"
#  from [f1b4f72fbde66dcea6a9d181cd27734fe9d3a435]
#    to [94491b6ddf035e42660d369f109e8fc1d080cbc4]
# 
# patch "commands.cc"
#  from [cde2422b6cf5dc41933fa697f6eb646cf5b8e350]
#    to [157253b2dde200336505b4ae8a95059e4dbfab3e]
# 
============================================================
--- ChangeLog	f1b4f72fbde66dcea6a9d181cd27734fe9d3a435
+++ ChangeLog	94491b6ddf035e42660d369f109e8fc1d080cbc4
@@ -1,3 +1,8 @@
+2006-04-12  Matthew Nicholson  <address@hidden>
+	
+	* commands.cc (pid_file::pid_file): Move check for open pidfile until
+	after we attempt to open the file :).
+
 2006-04-12  Matthew Gregan  <address@hidden>
 
 	* tests/t_pidfile_log_permissions.at: New test to check that we
============================================================
--- commands.cc	cde2422b6cf5dc41933fa697f6eb646cf5b8e350
+++ commands.cc	157253b2dde200336505b4ae8a95059e4dbfab3e
@@ -324,8 +324,8 @@
     if (path.empty())
       return;
     require_path_is_nonexistent(path, F("pid file '%s' already exists") % path);
+    file.open(path.as_external().c_str());
     E(file.is_open(), F("failed to create pid file '%s'") % path);
-    file.open(path.as_external().c_str());
     file << get_process_id() << endl;
     file.flush();
   }