# # patch "file_io.cc" # from [23eddf8c6fbb41be5f69ad4d38418ab0cc165d3c] # to [67b4df7bf278f7170ddb8fce85f8ecd13bd2efb6] # # patch "work.cc" # from [e4bf5864e53f92f99f9eb511d21fbb26d094bff7] # to [a3238e5c42b54662f1afd4609b7214de6023289a] # ======================================================================== --- file_io.cc 23eddf8c6fbb41be5f69ad4d38418ab0cc165d3c +++ file_io.cc 67b4df7bf278f7170ddb8fce85f8ecd13bd2efb6 @@ -234,9 +234,9 @@ void delete_dir_shallow(any_path const & p) { - require_path_is_dir(p, - F("directory to delete '%s' does not exist") % p, - F("directory to delete, '%s', is not a directory but a file") % p); + require_path_is_directory(p, + F("directory to delete '%s' does not exist") % p, + F("directory to delete, '%s', is not a directory but a file") % p); do_shallow_deletion_with_sane_error_message(p); } ======================================================================== --- work.cc e4bf5864e53f92f99f9eb511d21fbb26d094bff7 +++ work.cc a3238e5c42b54662f1afd4609b7214de6023289a @@ -196,6 +196,8 @@ node_id nid = new_roster.detach_node(*i); I(nid == n->self); new_roster.drop_detached_node(nid); + if (app.execute && path_exists(name)) + delete_file_or_dir_shallow(name); } }