Merge ~jslarraz/ubuntu-security-tools:fix-umt-changelog-increment-version into ubuntu-security-tools:master

[Jorge Sancho Larraz]

Add local madison as fallback to get package versions information for umt changelog.

When using rmadison (lpmad) to obtain version information for a package that is not in the archive (only on a ppa or locally), the umt changelog crashed because of https://code.launchpad.net/~jslarraz/ubuntu-security-tools/+git/ubuntu-security-tools/+merge/450145. This MR fixes this issue.

[Eduardo Barretto (ebarretto)]

thanks for taking care of this!
lgtm

review: Approve

diff --git a/build-tools/umt b/build-tools/umt
index cf08dc7..8ccfb79 100755
--- a/build-tools/umt
+++ b/build-tools/umt
@@ -420,6 +420,8 @@ def cmd_changelog():
                 note = "No-change re-build upload."
     else:
         pkg_list = search_packages(details['package'], use_rmadison=True)   # Avoid dependencies on local installation
+        if pkg_list in [None, []]:
+            pkg_list = search_packages(details['package'], use_rmadison=False)   # Use local madison as fallback
         new_ver = increment_version_security(details['version'], opt.esm, details=details, pkg_list=pkg_list, devel_release=ust['release_devel'])
 
         if opt.repeat:
diff --git a/package-tools/increment_version.py b/package-tools/increment_version.py
index 0cfc3d2..100a7a5 100644
--- a/package-tools/increment_version.py
+++ b/package-tools/increment_version.py
@@ -23,7 +23,7 @@ def get_suffix(devel, details, pkg_list, devel_release=""):
         suffix = "ubuntu1"
     else:
         suffix = "ubuntu0.1"
-        if (details is not None) and (pkg_list is not None):
+        if (details is not None) and (pkg_list not in [None, []]):
             release_id = get_release_id(details, pkg_list, devel_release)
             if release_id is not None:
                 suffix = "ubuntu0." + release_id + ".1"