From ac0a0342609a5f48668a5ff79fb43b7ce87ed81b Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Mon, 16 Dec 2019 22:37:45 +0100 Subject: [PATCH] Fix stack pref --- wo/cli/plugins/stack_pref.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/wo/cli/plugins/stack_pref.py b/wo/cli/plugins/stack_pref.py index bedfbc1..84dd000 100644 --- a/wo/cli/plugins/stack_pref.py +++ b/wo/cli/plugins/stack_pref.py @@ -151,13 +151,19 @@ def pre_pref(self, apt_packages): # nano if 'nano' in apt_packages: - if not WOFileUtils.grepcheck( - self, '/etc/apt/sources.list/wo-repo.list', - 'WordOps'): - Log.info(self, "Adding repository for Nano, please wait...") - Log.debug(self, 'Adding repository for Nano') - WORepo.add_key(self, WOVar.wo_nginx_key) - WORepo.add(self, repo_url=WOVar.wo_nginx_repo) + if WOVar.wo_distro == 'ubuntu': + if (WOVar.wo_platform_codename == 'bionic' or + WOVar.wo_platform_codename == 'xenial'): + Log.debug(self, 'Adding ppa for nano') + WORepo.add(self, ppa=WOVar.wo_ubuntu_backports) + else: + if not WOFileUtils.grepcheck( + self, '/etc/apt/sources.list/wo-repo.list', + 'WordOps'): + Log.info(self, "Adding repository for Nano, please wait...") + Log.debug(self, 'Adding repository for Nano') + WORepo.add_key(self, WOVar.wo_nginx_key) + WORepo.add(self, repo_url=WOVar.wo_nginx_repo) def post_pref(self, apt_packages, packages, upgrade=False):