calculate some things that will not change just once

canonical · Feb 3, 2020 · 52fc18b · 52fc18b
1 parent 7ded7c1
commit 52fc18b
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/subiquity/models/mirror.py b/subiquity/models/mirror.py
@@ -41,9 +41,8 @@
         ],
 }
 
-
-def get_default_mirror():
-    return get_mirror(DEFAULT, "primary", get_architecture())
+ARCHITECTURE = get_architecture()
+DEFAULT_MIRROR = get_mirror(DEFAULT, "primary", ARCHITECTURE)
 
 
 class MirrorModel(object):
@@ -53,21 +52,20 @@ def __init__(self):
 
     def set_country(self, cc):
         uri = self.get_mirror()
-        if uri != get_default_mirror():
+        if uri != DEFAULT_MIRROR:
             return
         parsed = parse.urlparse(uri)
         new = parsed._replace(netloc=cc + '.' + parsed.netloc)
         self.set_mirror(parse.urlunparse(new))
 
     def get_mirror(self):
-        return get_mirror(self.config, "primary", get_architecture())
+        return get_mirror(self.config, "primary", ARCHITECTURE)
 
     def set_mirror(self, mirror):
-        config = get_arch_mirrorconfig(
-            self.config, "primary", get_architecture())
+        config = get_arch_mirrorconfig(self.config, "primary", ARCHITECTURE)
         config["uri"] = mirror
 
     def render(self):
         return {
-             'apt': self.config
+             'apt': copy.deepcopy(self.config)
             }