1 files changed, 15 insertions, 15 deletions

diff --git a/libbuild2/filesystem.txx b/libbuild2/filesystem.txx
index 7404532..afdb48d 100644
--- a/libbuild2/filesystem.txx
+++ b/libbuild2/filesystem.txx
@@ -1,8 +1,6 @@
 // file      : libbuild2/filesystem.txx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <type_traits> // is_base_of
-
 #include <libbuild2/diagnostics.hxx>
 
 namespace build2
@@ -15,16 +13,17 @@ namespace build2
 
     // We don't want to print the command if we couldn't remove the file
     // because it does not exist (just like we don't print the update command
-    // if the file is up to date). This makes the below code a bit ugly.
+    // if the file is up to date). But we always want to print some command
+    // before we issue diagnostics. This makes the below code a bit ugly.
     //
-    auto print = [&f, &t, v] ()
+    auto print = [&f, &t, v] (bool ovr)
     {
-      if (verb >= v)
+      if (verb >= v || ovr)
       {
         if (verb >= 2)
           text << "rm " << f;
         else if (verb)
-          text << "rm " << t;
+          print_diag ("rm", t); // T can be target or path.
       }
     };
 
@@ -38,12 +37,12 @@ namespace build2
     }
     catch (const system_error& e)
     {
-      print ();
+      print (true);
       fail << "unable to remove file " << f << ": " << e << endf;
     }
 
     if (rs == rmfile_status::success)
-      print ();
+      print (false);
 
     return rs;
   }
@@ -56,16 +55,17 @@ namespace build2
 
     // We don't want to print the command if we couldn't remove the directory
     // because it does not exist (just like we don't print mkdir if it already
-    // exists) or if it is not empty. This makes the below code a bit ugly.
+    // exists) or if it is not empty. But we always want to print some command
+    // before we issue diagnostics. This makes the below code a bit ugly.
     //
-    auto print = [&d, &t, v] ()
+    auto print = [&d, &t, v] (bool ovr)
     {
-      if (verb >= v)
+      if (verb >= v || ovr)
       {
         if (verb >= 2)
           text << "rmdir " << d;
         else if (verb)
-          text << (std::is_base_of<dir_path, T>::value ? "rmdir " : "rm ") << t;
+          print_diag ("rmdir", t); // T can be target or dir_path.
       }
     };
 
@@ -79,7 +79,7 @@ namespace build2
     }
     catch (const system_error& e)
     {
-      print ();
+      print (true);
       fail << "unable to remove directory " << d << ": " << e << endf;
     }
 
@@ -87,14 +87,14 @@ namespace build2
     {
     case rmdir_status::success:
       {
-        print ();
+        print (false);
         break;
       }
     case rmdir_status::not_empty:
       {
         if (verb >= v && verb >= 2)
         {
-          text << d << " is "
+          info << d << " is "
                << (w ? "current working directory" : "not empty")
                << ", not removing";
         }