From 075c2299a7efaedcc632bf7fe1de306988587fb7 Mon Sep 17 00:00:00 2001 From: Alex Deymo Date: Thu, 4 Sep 2014 18:31:50 -0700 Subject: Move cbuildbot.portage_utilities to lib.portage_util. portage_utilities isn't cbuildbot specific as it is used by some chromite scripts. This change also renames the module to "portage_util" to match the style of other modules in chromite.lib. BUG=chromium:411146 TEST=FEATURES=test emerge-link chromite Change-Id: I62a823938d861c56c16e12d56a5381d89cbacf6a Reviewed-on: https://chromium-review.googlesource.com/216572 Commit-Queue: Alex Deymo Tested-by: Alex Deymo Reviewed-by: Mike Frysinger --- cbuildbot/stages/afdo_stages.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'cbuildbot/stages/afdo_stages.py') diff --git a/cbuildbot/stages/afdo_stages.py b/cbuildbot/stages/afdo_stages.py index a611b6a9d..abe69a75b 100644 --- a/cbuildbot/stages/afdo_stages.py +++ b/cbuildbot/stages/afdo_stages.py @@ -6,10 +6,10 @@ from chromite.cbuildbot import afdo from chromite.cbuildbot import constants -from chromite.cbuildbot import portage_utilities from chromite.lib import alerts from chromite.lib import cros_build_lib from chromite.lib import gs +from chromite.lib import portage_util from chromite.cbuildbot.stages import generic_stages @@ -35,8 +35,8 @@ class AFDODataGenerateStage(generic_stages.BoardSpecificBuilderStage, arch = self._GetCurrentArch() buildroot = self._build_root gs_context = gs.GSContext() - cpv = portage_utilities.BestVisible(constants.CHROME_CP, - buildroot=buildroot) + cpv = portage_util.BestVisible(constants.CHROME_CP, + buildroot=buildroot) afdo_file = None # Generation of AFDO could fail for different reasons. @@ -80,8 +80,8 @@ class AFDOUpdateEbuildStage(generic_stages.BuilderStage): def PerformStage(self): buildroot = self._build_root gs_context = gs.GSContext() - cpv = portage_utilities.BestVisible(constants.CHROME_CP, - buildroot=buildroot) + cpv = portage_util.BestVisible(constants.CHROME_CP, + buildroot=buildroot) version_number = cpv.version # We need the name of one board that has been setup in this -- cgit v1.2.3