maas/MAAS

canonical · Oct 8, 2024 · 6a7c201 · 6a7c201
1 parent a0e5ff1
commit 6a7c201
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/maas-agent/src/charm.py b/maas-agent/src/charm.py
@@ -158,7 +158,6 @@ def _on_upgrade(self, _event: ops.UpgradeCharmEvent) -> None:
         if current := MaasHelper.get_installed_channel():
             if current > MAAS_SNAP_CHANNEL:
                 msg = f"Cannot downgrade {current} to {MAAS_SNAP_CHANNEL}"
-                # XXX: It looks like ErrorStatus is not valid in the version of Juju used by maas-charms
                 self.unit.status = ops.BlockedStatus(msg)
                 logger.exception(msg)
                 return

diff --git a/maas-agent/src/helper.py b/maas-agent/src/helper.py
@@ -19,10 +19,10 @@
 
 
 def _join_cohort_(maas: Snap) -> str:
-    """Join the maas snap cohort if not part of it already.
+    """Join the MAAS snap cohort if not part of it already.
 
     Args:
-    maas (Snap): Instance of maas snap.
+    maas (Snap): Instance of MAAS snap.
     """
     if _cohort := re.match(r"cohort:\s*([^\n]+)", maas._snap("info", ["--verbose"])):
         cohort = _cohort.group(1)

diff --git a/maas-region/src/charm.py b/maas-region/src/charm.py
@@ -355,7 +355,6 @@ def _on_upgrade_charm(self, _event: ops.UpgradeCharmEvent) -> None:
         if current := MaasHelper.get_installed_channel():
             if current > MAAS_SNAP_CHANNEL:
                 msg = f"Cannot downgrade {current} to {MAAS_SNAP_CHANNEL}"
-                # XXX: It looks like ErrorStatus is not valid in the version of Juju used by maas-charms
                 self.unit.status = ops.BlockedStatus(msg)
                 logger.exception(msg)
                 return

diff --git a/maas-region/src/helper.py b/maas-region/src/helper.py
@@ -19,10 +19,10 @@
 
 
 def _join_cohort_(maas: Snap) -> str:
-    """Join the maas snap cohort if not part of it already.
+    """Join the MAAS snap cohort if not part of it already.
 
     Args:
-    maas (Snap): Instance of maas snap.
+    maas (Snap): Instance of MAAS snap.
     """
     if _cohort := re.match(r"cohort:\s*([^\n]+)", maas._snap("info", ["--verbose"])):
         cohort = _cohort.group(1)