Improve error message in patch application failure.

apply_issue.py

 #!/usr/bin/env python
 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Applies an issue from Rietveld.
 """
 
 import logging
 import optparse
@@ skipping 51 matching lines @@
   if scm_type == 'svn':
     scm_obj = checkout.SvnCheckout(options.root_dir, None, None, None, None)
   elif scm_type == 'git':
     scm_obj = checkout.GitCheckoutBase(options.root_dir, None, None)
   elif scm_type == None:
     scm_obj = checkout.RawCheckout(options.root_dir, None)
   else:
     parser.error('Couldn\'t determine the scm')
 
   # Apply the patch.
-  scm_obj.apply_patch(patchset)
+  try:
+    scm_obj.apply_patch(patchset)
+  except checkout.PatchApplicationFailed, e:
+    print >> sys.stderr, str(e)
+    return 1
   return 0
 
 
 if __name__ == "__main__":
   fix_encoding.fix_encoding()
   sys.exit(main())