Skip to content

Commit 11951f9

Browse files
committed
fixup
1 parent 321e582 commit 11951f9

1 file changed

Lines changed: 10 additions & 3 deletions

File tree

promise-types/appstreams/appstreams.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,15 @@ def _validate_state(self, value):
7676
accepted_str = "', '".join(accepted)
7777
raise ValidationError(f"State attribute must be '{accepted_str}'")
7878

79+
def _validate_module_name(self, name):
80+
self._validate_identifier(name, "module name")
81+
82+
def _validate_stream_name(self, stream):
83+
self._validate_identifier(stream, "stream name", required=False)
84+
85+
def _validate_profile_name(self, profile):
86+
self._validate_identifier(profile, "profile name", required=False)
87+
7988
def _validate_identifier(self, value, label, required=True):
8089
if not required and not value:
8190
return
@@ -224,8 +233,6 @@ def _get_module_state(self, mpc, module_name):
224233
return "disabled"
225234
elif state == mpc.ModuleState_INSTALLED:
226235
return "installed"
227-
elif state == mpc.ModuleState_DEFAULT:
228-
return "default"
229236
return "removed"
230237

231238
def _is_module_installed_with_packages(
@@ -456,7 +463,7 @@ def _remove_module(self, mpc, base, module_name, stream, profile):
456463

457464
def _reset_module(self, mpc, base, module_name):
458465
"""Reset a module to factory state — no stream pinned, no enabled/disabled flag."""
459-
if self._get_module_state(mpc, module_name) == "default":
466+
if mpc.getModuleState(module_name) == mpc.ModuleState_DEFAULT:
460467
self.log_verbose(
461468
f"Module {module_name} is already in default (reset) state"
462469
)

0 commit comments

Comments
 (0)