Merge ~calvinmwadime/software-properties:rename-ua-to-pro into software-properties:ubuntu/master

[Calvin Mwadime Makokha]

d/control: Depend on ubuntu-pro-client instead of ubuntu-advantage-tools

From v31, ubuntu-advantage-tools has been renamed to ubuntu-pro-client
The ubuntu-advantage-tools package is now a transitional package

Use `pro` instead of `ua` in utils.py.

[Nathan Teodosio (nteodosio)]

Thank you!

review: Approve

[Sebastien Bacher (seb128)]

Thanks

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 910451f..1d5db8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+software-properties (0.99.45) noble; urgency=medium
+
+  * softwareproperties/gtk/utils.py: use `pro` instead of `ua`
+  * d/control: Depend on ubuntu-pro-client instead of ubuntu-advantage-tools
+    (LP: #2057671)
+
+ -- Calvin Mwadime <[e-mail]>  Thu, 28 Mar 2024 12:35:35 +0300
+
 software-properties (0.99.44) noble; urgency=medium
 
   * Handle backup and restore of deb822 sources (LP: #2053228)
diff --git a/debian/control b/debian/control
index a555b21..1c4700f 100644
--- a/debian/control
+++ b/debian/control
@@ -84,7 +84,7 @@ Depends: gir1.2-gtk-3.0,
          python3-gi,
          python3-software-properties (= ${binary:Version}),
          software-properties-common,
-         ubuntu-advantage-tools (>= 27.11~),
+         ubuntu-pro-client,
          ubuntu-advantage-desktop-daemon,
          ubuntu-drivers-common (>= 1:0.9.6),
          ${misc:Depends},
diff --git a/softwareproperties/gtk/utils.py b/softwareproperties/gtk/utils.py
index 6f67f33..465e5bc 100644
--- a/softwareproperties/gtk/utils.py
+++ b/softwareproperties/gtk/utils.py
@@ -79,7 +79,7 @@ def get_ua_status():
     # status.json will exist on any attached system. It will also be created
     # by the systemd timer ua-timer which will update UA_STATUS_JSON every 12
     # hours to reflect current status of UA subscription services.
-    # Invoking `ua status` with subp will result in a network call to
+    # Invoking `pro status` with subp will result in a network call to
     # contracts.canonical.com which could raise Timeouts on network limited
     # machines. So, prefer the status.json file when possible.
     status_json = ""
@@ -90,21 +90,21 @@ def get_ua_status():
         try:
             # Success writes UA_STATUS_JSON
             result = subprocess.run(
-                ['ua', 'status', '--format=json'], stdout=subprocess.PIPE
+                ['pro', 'status', '--format=json'], stdout=subprocess.PIPE
             )
         except Exception as e:
-            print("Failed to run `ua status`:\n%s" % e)
+            print("Failed to run `pro status`:\n%s" % e)
             return {}
         if result.returncode != 0:
             print(
-                "Ubuntu Advantage client returned code %d" % result.returncode
+                "Ubuntu Pro client returned code %d" % result.returncode
             )
             return {}
         status_json = result.stdout
     if not status_json:
         print(
-            "Warning: no Ubuntu Advantage status found."
-            " Is ubuntu-advantage-tools installed?"
+            "Warning: no Ubuntu Pro Client status found."
+            " Is ubuntu-pro-client installed?"
         )
         return {}
     try:
@@ -114,7 +114,7 @@ def get_ua_status():
         return {}
     if status.get("_schema_version", "0.1") != "0.1":
         print(
-            "UA status schema version change: %s" % status["_schema_version"]
+            "Pro status schema version change: %s" % status["_schema_version"]
         )
     return status