From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sat, 9 Jan 2021 19:32:12 +0000 (-0800)
Subject: fix: handle --version not being passed to deployment script
X-Git-Tag: 2.46.0~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=58457e77310df32f2baa2de0cce4b6c1a7e93865;p=graphviz

fix: handle --version not being passed to deployment script

b443b70a828a34c79c71e41af9cb2eab7b950a14 incorrectly did not anticipate neither
the --force nor --version flags being passed to the deployment script.
Unfortunately I failed to notice this because I was testing using --force and
there was no easy way to test the final work flow until merging to master.

There is also no easy way to test this commit before being merged. I have run
pylint, but after that just need to cross my fingers.

Related to #1892.
---

diff --git a/ci/deploy.py b/ci/deploy.py
index 27158ebb1..421e28e8c 100644
--- a/ci/deploy.py
+++ b/ci/deploy.py
@@ -114,6 +114,10 @@ def main(args: [str]) -> int:
     gv_version = f.read().strip()
   log.info(f'VERSION == {gv_version}')
 
+  # if we were not passed an explicit version, use the one from the VERSION file
+  if options.version is None:
+    options.version = gv_version
+
   tarball = f'graphviz-{gv_version}.tar.gz'
   if not os.path.exists(tarball):
     log.error(f'source {tarball} not found')