summaryrefslogtreecommitdiff
path: root/cloudinit/util.py
diff options
context:
space:
mode:
authorRyan Harper <ryan.harper@canonical.com>2020-01-16 11:29:59 -0600
committerDaniel Watkins <oddbloke@ubuntu.com>2020-01-16 12:29:59 -0500
commit259d9c501472315e539701f00095743390eb89e5 (patch)
treeeb94a5437498cc7521a7fb876aeaa63026bff37d /cloudinit/util.py
parentbb4131a2bd36d9e8932fdcb61432260f16159cde (diff)
downloadvyos-cloud-init-259d9c501472315e539701f00095743390eb89e5.tar.gz
vyos-cloud-init-259d9c501472315e539701f00095743390eb89e5.zip
Ensure util.get_architecture() runs only once (#172)
* Ensure util.get_architecture() runs only once util.get_architecture() recently was wrapped using python3's lru_cache() which will cache the result so we only invoke 'dpkg --print-architecture' once. In practice, cloud-init.log will show multiple invocations of the command. The source of this was that the debian Distro object implements the get_primary_arch() with this command, but it was not calling it from util, but issuing a util.subp() directly. This branch also updates cc_apt_configure methods to fetch the arch value from the distro class, and then ensure that the methods apt_configure calls pass the arch value around. * utils: remove lsb_release and get_architecture wrappers The original lsb_release wrapper was used to prevent polluting the single value we cached, however lru_cache() already handles this case by using args, kwargs values to cache different calls to the method. * rename_apt_list: use all positional parameters
Diffstat (limited to 'cloudinit/util.py')
-rw-r--r--cloudinit/util.py10
1 files changed, 1 insertions, 9 deletions
diff --git a/cloudinit/util.py b/cloudinit/util.py
index 76d7db78..87480767 100644
--- a/cloudinit/util.py
+++ b/cloudinit/util.py
@@ -86,7 +86,7 @@ def get_architecture(target=None):
@lru_cache()
-def _lsb_release(target=None):
+def lsb_release(target=None):
fmap = {'Codename': 'codename', 'Description': 'description',
'Distributor ID': 'id', 'Release': 'release'}
@@ -109,14 +109,6 @@ def _lsb_release(target=None):
return data
-def lsb_release(target=None):
- if target_path(target) != "/":
- # do not use or update cache if target is provided
- return _lsb_release(target)
-
- return _lsb_release()
-
-
def target_path(target, path=None):
# return 'path' inside target, accepting target as None
if target in (None, ""):