dovecot-2.0: dsync: When showing mailbox names, show also their ...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/0a1a0d33c1b2
changeset: 12677:0a1a0d33c1b2
user:      Timo Sirainen <tss at iki.fi>
date:      Sat Mar 12 17:43:46 2011 +0200
description:
dsync: When showing mailbox names, show also their GUIDs.

diffstat:

 src/dsync/dsync-brain.c |  24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)

diffs (55 lines):

diff -r d3d6ed6d268b -r 0a1a0d33c1b2 src/dsync/dsync-brain.c
--- a/src/dsync/dsync-brain.c	Sat Mar 12 17:24:38 2011 +0200
+++ b/src/dsync/dsync-brain.c	Sat Mar 12 17:43:46 2011 +0200
@@ -667,8 +667,9 @@
 				brain_box->box = *src_boxes[src];
 				brain_box->src = src_boxes[src];
 				if (brain->verbose) {
-					i_info("%s: only in source",
-					       brain_box->box.name);
+					i_info("%s: only in source (guid=%s)",
+					       brain_box->box.name,
+					       dsync_guid_to_str(&brain_box->box.mailbox_guid));
 				}
 			}
  			src++;
@@ -679,8 +680,9 @@
 				brain_box->box = *dest_boxes[dest];
 				brain_box->dest = dest_boxes[dest];
 				if (brain->verbose) {
-					i_info("%s: only in dest",
-					       brain_box->box.name);
+					i_info("%s: only in dest (guid=%s)",
+					       brain_box->box.name,
+					       dsync_guid_to_str(&brain_box->box.mailbox_guid));
 				}
 			}
 			dest++;
@@ -694,8 +696,11 @@
 		brain_box = array_append_space(brain_boxes);
 		brain_box->box = *src_boxes[src];
 		brain_box->src = src_boxes[src];
-		if (brain->verbose)
-			i_info("%s: only in source", brain_box->box.name);
+		if (brain->verbose) {
+			i_info("%s: only in source (guid=%s)",
+			       brain_box->box.name,
+			       dsync_guid_to_str(&brain_box->box.mailbox_guid));
+		}
 	}
 	for (; dest < dest_count; dest++) {
 		if ((dest_boxes[dest]->flags &
@@ -705,8 +710,11 @@
 		brain_box = array_append_space(brain_boxes);
 		brain_box->box = *dest_boxes[dest];
 		brain_box->dest = dest_boxes[dest];
-		if (brain->verbose)
-			i_info("%s: only in dest", brain_box->box.name);
+		if (brain->verbose) {
+			i_info("%s: only in dest (guid=%s)",
+			       brain_box->box.name,
+			       dsync_guid_to_str(&brain_box->box.mailbox_guid));
+		}
 	}
 }