From 287fe1dcbc45e78de15874b011a3fb60257fbf58 Mon Sep 17 00:00:00 2001
From: Pier <plambri@redhat.com>
Date: Sat, 11 Apr 2015 14:14:06 +0100
Subject: [PATCH] corrections based on the feedback

---
 vdirsyncer/cli/.tasks.py.un~ | Bin 3728 -> 0 bytes
 vdirsyncer/cli/tasks.py      |  16 ++++++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)
 delete mode 100644 vdirsyncer/cli/.tasks.py.un~

diff --git a/vdirsyncer/cli/.tasks.py.un~ b/vdirsyncer/cli/.tasks.py.un~
deleted file mode 100644
index 2a0227a27390d375b0e530ab771d4f17a2265895..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3728
zcmeI#ze~eF6bJCM)+$v*q*|>%h*Mkbpo1U<!9hWA6WXPe5bIfsX;Lo{?5O{OIJ>+1
zA2_%u&N_>OgOiTx`(E$#6i2h=!RsY2ZIiwaFQk=b>%8o)d5=c?^5OR6?EYrpIyKx`
z-0G~HzQ1g|@uBD0+7+uT_Z1Ao@F`Uc(ngH3Uly>cG|Gj<d;&*fhIJ?35SJ?!92!&m
z9~7dZ3eoz{9UzVo!C@G$<MiEVJ=OzCQ2ea6QCT_`a5&n7eHlQ+CllC@;LwFIgWyJW
zxD1_af>OaPm=w0-Sar{FSUqTZu5YfGJI#8K*Gkr|$E~*A<ax;oMnNbq9>n-wG0YLG
z>`G`0v5x7in5ZnJVl9Cc(O@p)wo}ddfgK$BWEkw_YDLqwT)V}J=C)j6+ufAF0PWST
zAJ{lU1gteByiEem=)jn*NlFF0Ds<@uv+D;Qw;Rl_c2&WvSG&ek706y&47p?mYf}3e
zAjf&4+q2e`@HUBgTxZ6FO;IZ5B$x{Yi3OZK?P352tQ2a|O&47VGYBjD8*7?QsIXFM
zCcnS{ByO1UvVaF(Jo-jpXhNt#U^yKOvjQ+qiRaQZz}QipwF7gXb=EoecuCHhK4<h+
i!3erEcA{BB7s3ppn-g@g?q3Vg%~1YDxA{%?bnyv(N~Z7t

diff --git a/vdirsyncer/cli/tasks.py b/vdirsyncer/cli/tasks.py
index 5e08fcc..ea97715 100644
--- a/vdirsyncer/cli/tasks.py
+++ b/vdirsyncer/cli/tasks.py
@@ -21,12 +21,16 @@ def sync_pair(wq, pair_name, collections_to_sync, general, all_pairs,
     a_name, b_name, pair_options = all_pairs[pair_name]
 
     try:
-        all_collections = dict(collections_for_pair(
-            general['status_path'], a_name, b_name, pair_name,
-            all_storages[a_name], all_storages[b_name], pair_options
-        ))
-    except KeyError:
-        raise CliError('Could not find \"{}\" or \"{}\"\n'.format(a_name,b_name))
+        config_a, config_b = all_storages[a_name], all_storages[b_name]
+    except KeyError as e:
+        raise CliError('Pair {}: Storage {} not found. These are the '
+         'configured storages: {}'
+         .format(pair_name, str(e), list(all_storages)))
+
+    all_collections = dict(collections_for_pair(
+        general['status_path'], a_name, b_name, pair_name,
+        config_a, config_b, pair_options
+    ))
 
     # spawn one worker less because we can reuse the current one
     new_workers = -1