Re: One day I decided to replace a directory with a file

On Mon, Jul 25, 2005 at 06:09:49AM +0800, Dan Jacobson wrote:
> One day I decided to replace a directory with a file.
> 
> * These items have been added since the last update:
> comp/apt-offline
> * These items have been deleted since the last update:
> dir:comp/apt-offline
> 
> Well, as sitecopy 0.11.4 didn't figure out to do the rmdir first, one
> gets stuck with.

There are various cases like this which sitecopy can't handle, but 
actually I'm not sure if fixing this one is harmful.  Try the patch 
below - I'll probably realise what this breaks sometime tomorrow ;)

Index: src/sites.c
===================================================================
--- src/sites.c	(revision 661)
+++ src/sites.c	(working copy)
@@ -709,8 +709,8 @@
 	int (*func)(struct site *, void *session);
 	int guard;
     } handlers[] = {
+	{ update_delete_files, !site->nodelete },
 	{ update_create_directories, 1 },
-	{ update_delete_files, !site->nodelete },
 	{ update_move_files, site->checkmoved },
 	{ update_files, 1 },
 	{ update_links, site->symlinks == sitesym_maintain },
_______________________________________________
sitecopy maillist  -  [email protected]
http://dav.lyra.org/mailman/listinfo/sitecopy