[releng] convert-to-tarballs: update for the changes to the flatpak branch handling in gnome-build-meta

[Abderrahim Kitouni <akitouni src gnome org>]

commit 87e02e24299b894c1fa586c5012af1e091b7deab
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Thu Sep 10 21:03:11 2020 +0100

    convert-to-tarballs: update for the changes to the flatpak branch handling in gnome-build-meta

 tools/smoketesting/convert-to-tarballs.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/tools/smoketesting/convert-to-tarballs.py b/tools/smoketesting/convert-to-tarballs.py
index 8784455..04c68a5 100755
--- a/tools/smoketesting/convert-to-tarballs.py
+++ b/tools/smoketesting/convert-to-tarballs.py
@@ -300,9 +300,11 @@ def main(args):
 
     if int(splitted_version[1]) % 2 == 0:
         flatpak_branch = '{}.{}'.format(splitted_version[0], splitted_version[1])
+        qualifier = ''
         update_flatpak_branch = True
     elif int(splitted_version[2]) >= 90:
-        flatpak_branch = '{}.{}beta'.format(splitted_version[0], int(splitted_version[1]) + 1)
+        flatpak_branch = '{}.{}'.format(splitted_version[0], int(splitted_version[1]) + 1)
+        qualifier = 'beta'
         update_flatpak_branch = True
     else:
         update_flatpak_branch = False
@@ -327,7 +329,7 @@ def main(args):
             with open(cifile) as f:
                 ci = yaml.round_trip_load(f, preserve_quotes=True)
 
-            ci['variables']['FLATPAK_BRANCH'] = flatpak_branch
+            ci['variables']['FLATPAK_BRANCH'] = flatpak_branch + qualifier
 
             if 'BST_STRICT' in ci['variables']:
                 ci['variables']['BST_STRICT'] = '--strict'
@@ -341,6 +343,7 @@ def main(args):
                 conf = yaml.round_trip_load(f, preserve_quotes=True)
 
             conf['variables']['branch'] = flatpak_branch
+            conf['variables']['qualifier'] = qualifier
             conf['ref-storage'] = 'inline'
 
             with open(projectconf, 'w') as f: