From 7542a04fc794f6b236dfca5a3d3fbd6b2fed92f7 Mon Sep 17 00:00:00 2001 From: gc Date: Fri, 18 Nov 2005 22:08:50 +0000 Subject: [PATCH] if an entire directory is removed, dont forget to remove the target directory as well (reported by julien catalano) --- bin/booh-backend | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bin/booh-backend b/bin/booh-backend index b63a3a4..4c88919 100755 --- a/bin/booh-backend +++ b/bin/booh-backend @@ -619,11 +619,16 @@ def walk_source_dir die _("Source directory or sub-directories can't contain a single-quote character, sorry: %s") % dir end + dest_dir = make_dest_filename(dir.sub(/^#{Regexp.quote($source)}/, $dest)) + #- place xml document on proper node if exists, else create xmldir = optxpath[utf8(dir)] if $mode == 'use_config' || $mode == 'use_config_changetheme' if !xmldir || (xmldir.attributes['already-generated'] && !$force) || xmldir.attributes['deleted'] info("walking: #{dir}|#{$source}, 0 elements") + if xmldir && xmldir.attributes['deleted'] + system("rm -rf '#{dest_dir}'") + end next end else @@ -691,7 +696,6 @@ def walk_source_dir msg 3, _("\t%s videos") % videos.length info("walking: #{dir}|#{$source}, #{images.length + videos.length} elements") - dest_dir = make_dest_filename(dir.sub(/^#{Regexp.quote($source)}/, $dest)) system("mkdir -p '#{dest_dir}'") #- pass through if there are no images and videos -- 2.30.4