Try several ways of getting upstream version

1 files changed, 8 insertions, 5 deletions

diff --git a/jenkinstool b/jenkinstool
index c0f2d70..9b6b079 100755
--- a/jenkinstool
+++ b/jenkinstool
@@ -42,14 +42,17 @@ upstream_version()
 {
     if [ -e setup.py ]
     then
-        python setup.py --version || exit 1
-    elif [ -e debian/changelog ]
+        python setup.py --version && return
+    fi
+
+    if [ -e debian/changelog ]
     then
         dpkg-parsechangelog | sed -n '/^Version: /s///p' | sed 's/-[^-]*$//'
-    else
-        echo "UNKNOWN-PROJECT-VERSION"
-        exit 1
+        return
     fi
+
+    echo "Can't figure out upstream version" 1>&2
+    exit 1
 }
 
 commit_date()