[ostree] core: Ensure we clean up leftover directories during merge

[Colin Walters <walters src gnome org>]

commit 32c8166b2581e112560390fc8a0bc46e510313fd
Author: Colin Walters <walters verbum org>
Date:   Fri Dec 2 17:58:45 2011 -0500

    core: Ensure we clean up leftover directories during merge
    
    (Not sure why this regressed)

 src/libotutil/ot-gio-utils.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/src/libotutil/ot-gio-utils.c b/src/libotutil/ot-gio-utils.c
index ed730e7..cff9944 100644
--- a/src/libotutil/ot-gio-utils.c
+++ b/src/libotutil/ot-gio-utils.c
@@ -276,6 +276,8 @@ ot_gfile_merge_dirs (GFile    *destination,
   else
     goto out;
 
+  (void) rmdir (ot_gfile_get_path_cached (src));
+
   ret = TRUE;
  out:
   g_clear_object (&src_fileinfo);