From 4fc3b69d81b74ce4d39f1e0aa1ef54bdd7e12636 Mon Sep 17 00:00:00 2001 From: Manoj Srivastava Date: Wed, 10 Feb 2016 21:06:02 -0800 Subject: [PATCH] [set localtime]: Update locale group tasks Convert the locale group tasks frmom a simple list to a function. This now matches the other non-simple task groups. Signed-off-by: Manoj Srivastava --- bootstrapvz/common/task_groups.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/bootstrapvz/common/task_groups.py b/bootstrapvz/common/task_groups.py index 5a93202..ee83c95 100644 --- a/bootstrapvz/common/task_groups.py +++ b/bootstrapvz/common/task_groups.py @@ -33,16 +33,7 @@ def get_standard_groups(manifest): group.extend(get_network_group(manifest)) group.extend(get_apt_group(manifest)) group.extend(security_group) - - from bootstrapvz.common.releases import jessie - if manifest.release > jessie: - if not locale.SetLocalTimeLink in locale_group: - locale_group.extend(locale.SetLocalTimeLink) - else: - if not locale.SetLocalTimeCopy in locale_group: - locale_group.extend(locale.SetLocalTimeCopy) - group.extend(locale_group) - + group.extend(get_locale_group(manifest)) group.extend(get_bootloader_group(manifest)) group.extend(cleanup_group) return group @@ -142,10 +133,19 @@ def get_apt_group(manifest): security_group = [security.EnableShadowConfig] -locale_group = [locale.LocaleBootstrapPackage, - locale.GenerateLocale, - locale.SetTimezone, - ] + +def get_locale_group(manifest): + from bootstrapvz.common.releases import jessie + group = [ + locale.LocaleBootstrapPackage, + locale.GenerateLocale, + locale.SetTimezone, + ] + if manifest.release > jessie: + group.append(locale.SetLocalTimeLink) + else: + group.append(locale.SetLocalTimeCopy) + return group def get_bootloader_group(manifest):