Merge ~orndorffgrant/ubuntu/+source/ubuntu-advantage-tools:upload-30.1-noble into ubuntu/+source/ubuntu-advantage-tools:ubuntu/devel

[Grant Orndorff]

Fixes #2043836

Do we need to address any of the other errors that halted phasing of v30? https://ubuntu-archive-team.ubuntu.com/phased-updates.html

[Bryce Harrington (bryce)]

LGTM, +1

$ dput ubuntu ../ubuntu-advantage-tools_30.1_source.changes
D: Setting host argument.
Checking signature on .changes
gpg: ../ubuntu-advantage-tools_30.1_source.changes: Valid signature from E603B2578FB8F0FB
Checking signature on .dsc
gpg: ../ubuntu-advantage-tools_30.1.dsc: Valid signature from E603B2578FB8F0FB
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading ubuntu-advantage-tools_30.1.dsc: done.
  Uploading ubuntu-advantage-tools_30.1.tar.xz: done.
  Uploading ubuntu-advantage-tools_30.1_source.buildinfo: done.
  Uploading ubuntu-advantage-tools_30.1_source.changes: done.
Successfully uploaded packages.

review: Approve

[Simon Quigley (tsimonq2)]

review: Approve

Unmerged commits

5faf627... by Grant Orndorff on 2023-11-17

version 30.1

1aed988... by Grant Orndorff on 2023-11-17

version: fix UnboundLocalError in error-handling

LP: #2043836

diff --git a/debian/changelog b/debian/changelog
index 78901ae..5facae5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ubuntu-advantage-tools (30.1) noble; urgency=medium
+
+  * fix UnboundLocalError in update-check error handling (LP: #2043836)
+
+ -- Grant Orndorff <[e-mail]>  Fri, 17 Nov 2023 14:25:22 -0500
+
 ubuntu-advantage-tools (30) noble; urgency=medium
 
   * d/control:
diff --git a/uaclient/version.py b/uaclient/version.py
index 1a26f8f..aceff72 100644
--- a/uaclient/version.py
+++ b/uaclient/version.py
@@ -14,7 +14,7 @@ from uaclient.defaults import CANDIDATE_CACHE_PATH, UAC_RUN_PATH
 from uaclient.exceptions import ProcessExecutionError
 from uaclient.system import subp
 
-__VERSION__ = "30"
+__VERSION__ = "30.1"
 PACKAGED_VERSION = "@@PACKAGED_VERSION@@"
 
 
@@ -51,6 +51,7 @@ def get_last_known_candidate() -> Optional[str]:
         not os.path.exists(CANDIDATE_CACHE_PATH)
         or os.stat(CANDIDATE_CACHE_PATH).st_mtime < last_apt_cache_update
     ):
+        candidate_version = None
         try:
             candidate_version = get_pkg_candidate_version(
                 "ubuntu-advantage-tools"