summaryrefslogtreecommitdiff
path: root/cbuildbot/stages/afdo_stages.py
diff options
context:
space:
mode:
authorAlex Deymo <deymo@chromium.org>2014-09-04 18:31:50 -0700
committerchrome-internal-fetch <chrome-internal-fetch@google.com>2014-09-06 01:36:46 +0000
commit075c2299a7efaedcc632bf7fe1de306988587fb7 (patch)
treedd9285bf429d9dd450fc5e8bef694ad14d6668b7 /cbuildbot/stages/afdo_stages.py
parenta0f93add0bd88add4fafb9a829c42651089810e7 (diff)
downloadchromite-075c2299a7efaedcc632bf7fe1de306988587fb7.tar.gz
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 <deymo@chromium.org> Tested-by: Alex Deymo <deymo@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org>
Diffstat (limited to 'cbuildbot/stages/afdo_stages.py')
-rw-r--r--cbuildbot/stages/afdo_stages.py10
1 files changed, 5 insertions, 5 deletions
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