# # # patch "work.cc" # from [9c675eede57b020fff6cc7a6e934b2d4dbbca34d] # to [26b973715a31b3ce274f6d3bcfcce835fa2275c7] # ============================================================ --- work.cc 9c675eede57b020fff6cc7a6e934b2d4dbbca34d +++ work.cc 26b973715a31b3ce274f6d3bcfcce835fa2275c7 @@ -922,7 +922,6 @@ } else P(F("adding %s") % dst_pth); - // This will complain if the move is actually impossible if (dst_pth == file_path()) { // root dir attach, so we move contents, rather than the dir itself @@ -933,7 +932,7 @@ I(!bookkeeping_path::is_bookkeeping_path((*i)())); move_file(src_pth / (*i)(), dst_pth / (*i)()); } - for (std::vector::const_iterator i = files.begin(); i != files.end(); ++i) + for (std::vector::const_iterator i = dirs.begin(); i != dirs.end(); ++i) { I(!bookkeeping_path::is_bookkeeping_path((*i)())); move_dir(src_pth / (*i)(), dst_pth / (*i)()); @@ -942,6 +941,7 @@ root_dir_attached = true; } else + // This will complain if the move is actually impossible move_path(src_pth, dst_pth); }