Replace lftp's call to 'rmdir' by calls to 'rm -rf'.

diff --git a/brioche b/brioche
index 8e7e6322be1a26a7251f2afa900b2eaf3aee88cc..ca4501d9c167fd688e6faf93da33af68a530f083 100755 (executable)
--- a/brioche
+++ b/brioche
@@ -294,7 +294,7 @@ ftp_rotate()
   # Build commands
   # Remove oldest run
   if [ "$FTP_KEEP" != "0" ]; then
   # Build commands
   # Remove oldest run
   if [ "$FTP_KEEP" != "0" ]; then

-    commands="$commands; rmdir ${lastrun}"
+    commands="$commands; rm -rf ${lastrun}"

 
     # Move everything back
     for run in `seq $FTP_KEEP -1 2`; do
 
     # Move everything back
     for run in `seq $FTP_KEEP -1 2`; do


@@ -305,7 +305,7 @@ ftp_rotate()
     # Move "old latest" to run-1
     commands="$commands; mv latest run-1"
   else
     # Move "old latest" to run-1
     commands="$commands; mv latest run-1"
   else

-    commands="$commands; rmdir latest"
+    commands="$commands; rm -rf latest"

   fi
 
   # Create "new latest" directory
   fi
 
   # Create "new latest" directory

diff --git a/changelog b/changelog
index 5f7b908a7d8687bb267713048bdb40d04aaf884d..14b80481a3614b477f2675d2b9a197ef228288e3 100644 (file)
--- a/changelog
+++ b/changelog
@@ -1,6 +1,6 @@
 brioche 1.2
   [ Amand Tihon]
 brioche 1.2
   [ Amand Tihon]

-  
+  * Replace lftp's call to 'rmdir' by calls to 'rm -rf'.

 
 brioche 1.1
 
 
 brioche 1.1