From 92ae6f1e0d76815a6cd9a276f46f9389af34383a Mon Sep 17 00:00:00 2001
From: hummypkg <af123@hummy.tv>
Date: Tue, 29 Oct 2013 20:11:39 +0000
Subject: [PATCH] updates

---
 CONTROL/control                | 4 ++--
 webif/plugin/sweeper/auto.hook | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CONTROL/control b/CONTROL/control
index 4650fa5..8a94034 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,8 +1,8 @@
 Package: sweeper
 Priority: optional
 Section: misc
-Version: 1.0.8-1
+Version: 1.0.8-3
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
-Depends: webif(>=1.0.6)
+Depends: webif(>=1.0.6-7)
 Description: Automatically manage single recording files.
diff --git a/webif/plugin/sweeper/auto.hook b/webif/plugin/sweeper/auto.hook
index f7cc7bc..44aa844 100644
--- a/webif/plugin/sweeper/auto.hook
+++ b/webif/plugin/sweeper/auto.hook
@@ -179,6 +179,7 @@ proc ::sweeper::find {root target orig} {
 }
 
 proc ::sweeper:folder_merge {src dst} {
+	if {$src eq $dst} return
 	log "Moving recordings from $src to $dst" 0
 	foreach e [readdir -nocomplain $src] {
 		if {![string match {*.ts} $e]} continue
@@ -205,7 +206,10 @@ proc ::sweeper:folder_merge {src dst} {
 		}
 	}
 	if {![system rmdir_if_empty $src]} {
-		log "Failed to remove directory: $msg" 0
+		log "Failed to remove directory" 0
+		foreach l [system rmdir_if_empty $src 1] {
+			log "Blocking file: $l" 0
+		}
 	}
 	if {$dst ni $::sweeper::recalc} {
 		lappend ::sweeper::recalc $dst