dch: Don't crash when we fail to get an upstream version

Closes: #879495

diff --git a/gbp/scripts/dch.py b/gbp/scripts/dch.py
index 325a0372de29249de2b8238e2361f77407ebbed1..ff4fb95c89b490acbb9893aebb771cdf97e6fda0 100644 (file)
--- a/gbp/scripts/dch.py
+++ b/gbp/scripts/dch.py
@@ -50,6 +50,9 @@ def guess_version_from_upstream(repo, upstream_tag_format, upstream_branch, cp=N
                                                     upstream_branch,
                                                     epoch=epoch,
                                                     debian_release=False)
+        if version is None:
+            gbp.log.warn("Failed to find upstream version tag")
+            return None
         gbp.log.debug("Found upstream version %s." % version)
         if compare_versions(version, cmp_version) > 0:
             return "%s-1" % version