[releng/abderrahim/convenience-fixes: 2/2] convert-to-tarballs: don't require a version



commit dee495b58dac4e43c4972d65b9f6ff10a0e116ba
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Wed Mar 27 17:31:46 2019 +0100

    convert-to-tarballs: don't require a version
    
    Assume an unstable release if no version not given

 tools/smoketesting/convert-to-tarballs.py | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)
---
diff --git a/tools/smoketesting/convert-to-tarballs.py b/tools/smoketesting/convert-to-tarballs.py
index d25c605..67519f3 100755
--- a/tools/smoketesting/convert-to-tarballs.py
+++ b/tools/smoketesting/convert-to-tarballs.py
@@ -799,10 +799,6 @@ def main(args):
                       default=True, help="do not convert, only try to update elements that already use 
tarballs")
     (options, args) = parser.parse_args()
 
-    if not options.version:
-        parser.print_help()
-        sys.exit(1)
-
     if not options.tarballdir:
         tarballdir = os.path.join(os.getcwd(), 'tarballs')
         try:
@@ -811,11 +807,6 @@ def main(args):
             pass
         options.tarballdir = tarballdir
 
-    splitted_version = options.version.split(".")
-    if (len(splitted_version) != 3):
-        sys.stderr.write("ERROR: Version number is not valid\n")
-        sys.exit(1)
-
     if options.config:
         try:
             config = Options(os.path.join(program_dir, options.config))
@@ -825,12 +816,19 @@ def main(args):
             except IOError:
                 sys.stderr.write("ERROR: Config file could not be loaded from file: 
{}\n".format(options.config))
                 sys.exit(1)
-    else:
+    elif options.version:
+        splitted_version = options.version.split(".")
+        if (len(splitted_version) != 3):
+            sys.stderr.write("ERROR: Version number is not valid\n")
+            sys.exit(1)
+
         is_stable = (int(splitted_version[1]) % 2 == 0)
         if is_stable:
             config = Options(os.path.join(program_dir, 'tarball-conversion-stable.config'))
         else:
             config = Options(os.path.join(program_dir, 'tarball-conversion.config'))
+    else:
+        config = Options(os.path.join(program_dir, 'tarball-conversion.config'))
 
     if options.convert:
         if os.path.isfile('versions'):


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]