X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;ds=sidebyside;f=apps%2Fpatchwork%2Fbin%2Fpwclient;h=70d4f82932728dbf43a00e14ea0f14e7ebdd923b;hb=235238fdfbfbf4e201a36c0ea57576bf63bc3536;hp=2afccdf604c4bed6a8c95e43224e32861a708825;hpb=4f152d818977fb6a9f1ca1b38f88253cf61a8c73;p=patchwork

diff --git a/apps/patchwork/bin/pwclient b/apps/patchwork/bin/pwclient
index 2afccdf..70d4f82 100755
--- a/apps/patchwork/bin/pwclient
+++ b/apps/patchwork/bin/pwclient
@@ -142,7 +142,14 @@ def list_patches(patches, format_str=None):
 
         def patch_field(matchobj):
             fieldname = matchobj.group(1)
-            return str(patch[fieldname])
+
+            if fieldname == "_msgid_":
+                # naive way to strip < and > from message-id
+                val = string.strip(str(patch["msgid"]), "<>")
+            else:
+                val = str(patch[fieldname])
+
+            return val
 
         for patch in patches:
             print(format_field_re.sub(patch_field, format_str))
@@ -262,6 +269,7 @@ def action_apply(rpc, patch_id, apply_cmd=None):
     if len(s) > 0:
         proc = subprocess.Popen(apply_cmd, stdin = subprocess.PIPE)
         proc.communicate(unicode(s).encode('utf-8'))
+        return proc.returncode
     else:
         sys.stderr.write("Error: No patch content found\n")
         sys.exit(1)
@@ -352,6 +360,10 @@ def main():
         'id', metavar='ID', nargs='*', action='store', type=int,
         help='Patch ID',
     )
+    hash_parser.add_argument(
+        '-p', metavar='PROJECT',
+        help='''Lookup patch in project'''
+    )
 
     filter_parser = argparse.ArgumentParser(add_help=False, version=False)
     filter_parser.add_argument(
@@ -595,7 +607,6 @@ def main():
 
     url = config.get(project_str, 'url')
 
-    (username, password) = (None, None)
     transport = None
     if action in auth_actions:
         if config.has_option(project_str, 'username') and \
@@ -673,14 +684,20 @@ def main():
 
     elif action == 'apply':
         for patch_id in non_empty(h, patch_ids):
-            action_apply(rpc, patch_id)
+            ret = action_apply(rpc, patch_id)
+            if ret:
+                sys.stderr.write("Apply failed with exit status %d\n" % ret)
+                sys.exit(1)
 
     elif action == 'git_am':
         cmd = ['git', 'am']
         if do_signoff:
             cmd.append('-s')
         for patch_id in non_empty(h, patch_ids):
-            action_apply(rpc, patch_id, cmd)
+            ret = action_apply(rpc, patch_id, cmd)
+            if ret:
+                sys.stderr.write("'git am' failed with exit status %d\n" % ret)
+                sys.exit(1)
 
     elif action == 'update':
         for patch_id in non_empty(h, patch_ids):