diff -r 7864deb8c879 -r 9d3800a5e930 cyrus-migrate.pl --- a/cyrus-migrate.pl Wed Jun 17 08:11:32 2009 +0200 +++ b/cyrus-migrate.pl Mon Aug 03 17:06:17 2009 +0200 @@ -51,6 +51,13 @@ use Getopt::Long; use File::Path; +END { + my $acl_file = 'cyrus_mbox_acls.txt'; + -f $acl_file && unlink $acl_file; +} + + + my $ME = basename $0; my $dsn = "DBI:mysql:database=mail;host=pu.schlittermann.de"; @@ -140,7 +147,7 @@ system("$cmd --syncacls --justfolders $logfile"); warn "$ME: migration of mailbox $mailbox failed, see $logfile\n" if ($? != 0); } else { - system("$cmd --delete2 $logfile"); + system("$cmd --expunge2 --delete2 $logfile"); warn "$ME: migration of mailbox $mailbox failed, see $logfile\n" if ($? != 0); } }