Cleanup auxiliary environment save fileHEADmaster

1 files changed, 3 insertions, 1 deletions

diff --git a/bbot/agent/agent.cxx b/bbot/agent/agent.cxx
index d6a7d4b..75f7228 100644
--- a/bbot/agent/agent.cxx
+++ b/bbot/agent/agent.cxx
@@ -1577,7 +1577,9 @@ try
   const bootstrapped_machine_manifest& mm (am.manifest);
 
   path ef (tftp_put_dir / "environment"); // Environment upload file.
+  path efm (ef + '-' + mm.machine.name);  // Environment upload saved file.
   try_rmfile (ef);
+  try_rmfile (efm);
 
   // <name>-<toolchain>-<xxx>
   //
@@ -1777,7 +1779,7 @@ try
     // Rename and keep the environment file for debugging (it will be removed
     // at the end as part of the tftp_put_dir cleanup).
     //
-    mvfile (ef, ef + '-' + mm.machine.name);
+    mvfile (ef, efm);
 
     return make_pair (auxiliary_machine_result {move (xp), move (m)},
                       move (env));