dovecot-2.2: dsync: Renamed -F parameter to -O to avoid a conflict

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/573118da2eaa
changeset: 18923:573118da2eaa
user:      Timo Sirainen <tss at iki.fi>
date:      Fri Aug 07 15:13:34 2015 +0300
description:
dsync: Renamed -F parameter to -O to avoid a conflict
doveadm mail commands already had a generic -F parameter.

diffstat:

 src/doveadm/doveadm-dsync.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r 91005181b997 -r 573118da2eaa src/doveadm/doveadm-dsync.c
--- a/src/doveadm/doveadm-dsync.c	Fri Aug 07 13:32:02 2015 +0300
+++ b/src/doveadm/doveadm-dsync.c	Fri Aug 07 15:13:34 2015 +0300
@@ -38,7 +38,7 @@
 #include <ctype.h>
 #include <sys/wait.h>
 
-#define DSYNC_COMMON_GETOPT_ARGS "+1a:dEfF:g:l:m:n:NPr:Rs:t:Ux:"
+#define DSYNC_COMMON_GETOPT_ARGS "+1a:dEfg:l:m:n:NO:Pr:Rs:t:Ux:"
 #define DSYNC_REMOTE_CMD_EXIT_WAIT_SECS 30
 /* The broken_char is mainly set to get a proper error message when trying to
    convert a mailbox with a name that can't be used properly translated between
@@ -941,15 +941,15 @@
 	case 'f':
 		ctx->sync_type = DSYNC_BRAIN_SYNC_TYPE_FULL;
 		break;
-	case 'F': {
+	case 'O': {
 		const char *str = optarg;
 
 		if (strchr(str, ' ') != NULL)
-			i_fatal("-F parameter doesn't support multiple flags currently");
+			i_fatal("-O parameter doesn't support multiple flags currently");
 		if (str[0] == '-')
 			str++;
 		if (str[0] == '\\' && imap_parse_system_flag(str) == 0)
-			i_fatal("Invalid system flag given for -F parameter: '%s'", str);
+			i_fatal("Invalid system flag given for -O parameter: '%s'", str);
 		ctx->sync_flags = optarg;
 		break;
 	}