From e1e5013ad5bfef9e3ee9b523e0241eafa860c93f Mon Sep 17 00:00:00 2001 From: Dan Bungert Date: Wed, 4 Aug 2021 14:28:34 -0600 Subject: [PATCH] mirror: s/is_default/mirror_is_default Clarify that the mirror is the default, as there are other things under mirror that are not relevant to this determination. --- subiquity/models/mirror.py | 4 ++-- subiquity/server/controllers/mirror.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/subiquity/models/mirror.py b/subiquity/models/mirror.py index 96461ed6..31931ea8 100644 --- a/subiquity/models/mirror.py +++ b/subiquity/models/mirror.py @@ -52,11 +52,11 @@ class MirrorModel(object): self.architecture = get_architecture() self.default_mirror = self.get_mirror() - def is_default(self): + def mirror_is_default(self): return self.get_mirror() == self.default_mirror def set_country(self, cc): - if not self.is_default(): + if not self.mirror_is_default(): return uri = self.get_mirror() parsed = parse.urlparse(uri) diff --git a/subiquity/server/controllers/mirror.py b/subiquity/server/controllers/mirror.py index 6c23785a..67afdfe6 100644 --- a/subiquity/server/controllers/mirror.py +++ b/subiquity/server/controllers/mirror.py @@ -55,7 +55,7 @@ class MirrorController(SubiquityController): return geoip = data.pop('geoip', True) merge_config(self.model.config, data) - self.geoip_enabled = geoip and self.model.is_default() + self.geoip_enabled = geoip and self.model.mirror_is_default() @with_context() async def apply_autoinstall_config(self, context):