Fix Zanata upload

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>

Author: sgallagher

mmdzanata/cli.py

@@ -114,16 +114,33 @@ def extract(ctx, upload):
         # Use the zanata-cli to upload the pot file
         # It would be better to use the REST API directly here, but the XML
         # payload format is not documented.
+
+        # First ensure that the requested branch exists in Zanata
+        zanata_args = ['/usr/bin/zanata-cli', '-B', '-e', 'put-version',
+                       '--url', ctx.parent.obj['zanata_url'],
+                       '--version-project', ctx.parent.obj['zanata_project'],
+                       '--version-slug', ctx.parent.obj['branch']]
+        result = subprocess.run(zanata_args, capture_output=True)
+        if result.returncode:
+            print(result.stderr.decode('utf-8'))
+            print(result.stdout.decode('utf-8'))
+            sys.exit(1)
+
+        # Update the translatable strings for this branch
         zanata_args = ['/usr/bin/zanata-cli', '-B', '-e', 'push',
                        '--url', ctx.parent.obj['zanata_url'],
                        '--project', ctx.parent.obj['zanata_project'],
                        '--project-type', 'gettext',
-                       '--project-version', ctx.parent.obj['branch']]
+                       '--project-version', ctx.parent.obj['branch'],
+                       '--src-dir', '.']
         result = subprocess.run(zanata_args, capture_output=True)
         if result.returncode:
-            print(result.stderr)
-            print(result.stdout)
-            sys.exit(1)
+            print(result.stderr.decode('utf-8'))
+            print(result.stdout.decode('utf-8'))
+            sys.exit(2)
+
+        print("Uploaded translatable strings for %s to Zanata" % (
+            ctx.obj['branch']))
 
 
 ##############################################################################