commit baca5f7e88e07c86f402ae7423bb3171a33688e3
author David Pursehouse <david.pursehouse@sonymobile.com> Mon Feb 17 07:56:59 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Feb 17 07:57:00 2014 +0000
tree dbb0edae6f8d08c2314a5595ad59ec467faf7d54
parent 565480588d2bff4205b437862505e77382189811
parent 1829101e285cf7956d045cf7a04a8adb7f4c0109

Merge "Add error message for download -c conflicts"

subcmds/download.py

diff --git a/subcmds/download.py b/subcmds/download.py
index 471e88b..098d8b4 100644
--- a/subcmds/download.py
+++ b/subcmds/download.py
@@ -18,6 +18,7 @@
 import sys
 
 from command import Command
+from error import GitError
 
 CHANGE_RE = re.compile(r'^([1-9][0-9]*)(?:[/\.-]([1-9][0-9]*))?$')
 
@@ -87,7 +88,12 @@
         for c in dl.commits:
           print('  %s' % (c), file=sys.stderr)
       if opt.cherrypick:
-        project._CherryPick(dl.commit)
+        try:
+          project._CherryPick(dl.commit)
+        except GitError:
+          print('[%s] Could not complete the cherry-pick of %s' \
+                % (project.name, dl.commit), file=sys.stderr)
+
       elif opt.revert:
         project._Revert(dl.commit)
       elif opt.ffonly: