diff options
26 files changed, 145 insertions, 146 deletions
diff --git a/cbuildbot/afdo.py b/cbuildbot/afdo.py index 0cd0290f4..c378df0e8 100644 --- a/cbuildbot/afdo.py +++ b/cbuildbot/afdo.py @@ -140,7 +140,7 @@ def CheckAFDOPerfData(arch, cpv, buildroot, gs_context): Args: arch: architecture we're going to build Chrome for. - cpv: The portage_utilities.CPV object for chromeos-chrome. + cpv: The portage_util.CPV object for chromeos-chrome. buildroot: buildroot where AFDO data should be stored. gs_context: GS context to retrieve data. diff --git a/cbuildbot/cbuildbot_run.py b/cbuildbot/cbuildbot_run.py index ecced6438..40f711664 100644 --- a/cbuildbot/cbuildbot_run.py +++ b/cbuildbot/cbuildbot_run.py @@ -36,8 +36,8 @@ from chromite.cbuildbot import archive_lib from chromite.cbuildbot import metadata_lib from chromite.cbuildbot import constants from chromite.cbuildbot import manifest_version -from chromite.cbuildbot import portage_utilities from chromite.cbuildbot import validation_pool +from chromite.lib import portage_util class RunAttributesError(Exception): @@ -721,8 +721,8 @@ class _BuilderRunBase(object): Returns: The new value of attrs.chrome_version (e.g. "35.0.1863.0"). """ - cpv = portage_utilities.BestVisible(constants.CHROME_CP, - buildroot=self.buildroot) + cpv = portage_util.BestVisible(constants.CHROME_CP, + buildroot=self.buildroot) return cpv.version_no_rev.partition('_')[0] diff --git a/cbuildbot/failures_lib.py b/cbuildbot/failures_lib.py index 4dd01d842..0d980a9c1 100644 --- a/cbuildbot/failures_lib.py +++ b/cbuildbot/failures_lib.py @@ -8,8 +8,8 @@ import collections import sys import traceback -from chromite.cbuildbot import portage_utilities from chromite.lib import cros_build_lib +from chromite.lib import portage_util class StepFailure(Exception): @@ -357,7 +357,7 @@ class BuildFailureMessage(object): suspects = set() for tb in self.tracebacks: for package in tb.exception.failed_packages: - failed_projects = portage_utilities.FindWorkonProjects([package]) + failed_projects = portage_util.FindWorkonProjects([package]) blame_assigned = False for change in changes: if change.project in failed_projects: diff --git a/cbuildbot/prebuilts.py b/cbuildbot/prebuilts.py index 41de448ae..cdc8b53fb 100644 --- a/cbuildbot/prebuilts.py +++ b/cbuildbot/prebuilts.py @@ -11,8 +11,8 @@ import os from chromite.cbuildbot import cbuildbot_config from chromite.cbuildbot import commands from chromite.cbuildbot import constants -from chromite.cbuildbot import portage_utilities from chromite.lib import cros_build_lib +from chromite.lib import portage_util _PREFLIGHT_BINHOST = 'PREFLIGHT_BINHOST' _CHROME_BINHOST = 'CHROME_BINHOST' @@ -47,7 +47,7 @@ def _AddPackagesForPrebuilt(filename): for line in f: atom = line.split('#', 1)[0].strip() try: - cpv = portage_utilities.SplitCPV(atom) + cpv = portage_util.SplitCPV(atom) except ValueError: cros_build_lib.Warning('Could not split atom %r (line: %r)', atom, line) 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 diff --git a/cbuildbot/stages/artifact_stages.py b/cbuildbot/stages/artifact_stages.py index d781e9d1a..2735494e5 100644 --- a/cbuildbot/stages/artifact_stages.py +++ b/cbuildbot/stages/artifact_stages.py @@ -16,13 +16,13 @@ from chromite.cbuildbot import commands from chromite.cbuildbot import failures_lib from chromite.cbuildbot import cbuildbot_config from chromite.cbuildbot import constants -from chromite.cbuildbot import portage_utilities from chromite.cbuildbot import prebuilts from chromite.cbuildbot.stages import generic_stages from chromite.lib import cros_build_lib from chromite.lib import git from chromite.lib import osutils from chromite.lib import parallel +from chromite.lib import portage_util from chromite.scripts import cros_generate_breakpad_symbols @@ -95,8 +95,8 @@ class ArchiveStage(generic_stages.BoardSpecificBuilderStage, # If chrome is not installed, skip archiving. chroot_path = os.path.join(self._build_root, constants.DEFAULT_CHROOT_DIR) board_path = os.path.join(chroot_path, 'build', self._current_board) - if not portage_utilities.IsPackageInstalled(constants.CHROME_CP, - board_path): + if not portage_util.IsPackageInstalled(constants.CHROME_CP, + board_path): return cmd = ['strip_package', '--board', self._current_board, @@ -137,7 +137,7 @@ class ArchiveStage(generic_stages.BoardSpecificBuilderStage, See BuildStandaloneArchive in cbuildbot_commands.py for format docs. """ - custom_artifacts_file = portage_utilities.ReadOverlayFile( + custom_artifacts_file = portage_util.ReadOverlayFile( 'scripts/artifacts.json', board=board) artifacts = None diff --git a/cbuildbot/stages/completion_stages.py b/cbuildbot/stages/completion_stages.py index 3c56c9b68..2e7f24be9 100644 --- a/cbuildbot/stages/completion_stages.py +++ b/cbuildbot/stages/completion_stages.py @@ -12,7 +12,6 @@ from chromite.cbuildbot import failures_lib from chromite.cbuildbot import results_lib from chromite.cbuildbot import constants from chromite.cbuildbot import manifest_version -from chromite.cbuildbot import portage_utilities from chromite.cbuildbot import tree_status from chromite.cbuildbot import validation_pool from chromite.cbuildbot.stages import generic_stages @@ -20,6 +19,7 @@ from chromite.cbuildbot.stages import sync_stages from chromite.lib import alerts from chromite.lib import cros_build_lib from chromite.lib import git +from chromite.lib import portage_util @@ -509,7 +509,7 @@ class CommitQueueCompletionStage(MasterSlaveSyncCompletionStage): # After submitting the pool, update the commit hashes for uprevved # ebuilds. manifest = git.ManifestCheckout.Cached(self._build_root) - portage_utilities.EBuild.UpdateCommitHashesForChanges( + portage_util.EBuild.UpdateCommitHashesForChanges( self.sync_stage.pool.changes, self._build_root, manifest) if cbuildbot_config.IsPFQType(self._run.config.build_type): super(CommitQueueCompletionStage, self).HandleSuccess() diff --git a/cbuildbot/stages/generic_stages.py b/cbuildbot/stages/generic_stages.py index bbe70825f..441fa9449 100644 --- a/cbuildbot/stages/generic_stages.py +++ b/cbuildbot/stages/generic_stages.py @@ -26,13 +26,13 @@ from chromite.cbuildbot import commands from chromite.cbuildbot import failures_lib from chromite.cbuildbot import results_lib from chromite.cbuildbot import constants -from chromite.cbuildbot import portage_utilities from chromite.cbuildbot import repository from chromite.lib import cidb from chromite.lib import cros_build_lib from chromite.lib import gs from chromite.lib import osutils from chromite.lib import parallel +from chromite.lib import portage_util from chromite.lib import retry_util from chromite.lib import timeout_util @@ -145,9 +145,9 @@ class BuilderStage(object): def _ExtractOverlays(self): """Extracts list of overlays into class.""" - overlays = portage_utilities.FindOverlays( + overlays = portage_util.FindOverlays( self._run.config.overlays, buildroot=self._build_root) - push_overlays = portage_utilities.FindOverlays( + push_overlays = portage_util.FindOverlays( self._run.config.push_overlays, buildroot=self._build_root) # Sanity checks. @@ -698,7 +698,7 @@ class ArchivingStageMixin(object): if (not self._IsInUploadBlacklist(filename) and (hasattr(self, '_current_board') or board)): board = board or self._current_board - custom_artifacts_file = portage_utilities.ReadOverlayFile( + custom_artifacts_file = portage_util.ReadOverlayFile( 'scripts/artifacts.json', board=board) if custom_artifacts_file is not None: json_file = json.loads(custom_artifacts_file) diff --git a/cbuildbot/stages/generic_stages_unittest.py b/cbuildbot/stages/generic_stages_unittest.py index d353e7fb1..9cb2082ba 100755 --- a/cbuildbot/stages/generic_stages_unittest.py +++ b/cbuildbot/stages/generic_stages_unittest.py @@ -18,7 +18,6 @@ from chromite.cbuildbot import cbuildbot_config as config from chromite.cbuildbot import failures_lib from chromite.cbuildbot import results_lib from chromite.cbuildbot import cbuildbot_run -from chromite.cbuildbot import portage_utilities from chromite.cbuildbot.stages import generic_stages from chromite.lib import cros_build_lib from chromite.lib import cros_build_lib_unittest @@ -26,6 +25,7 @@ from chromite.lib import cros_test_lib from chromite.lib import osutils from chromite.lib import parallel from chromite.lib import partial_mock +from chromite.lib import portage_util from chromite.scripts import cbuildbot # TODO(build): Finish test wrapper (http://crosbug.com/37517). @@ -145,7 +145,7 @@ class StageTest(cros_test_lib.MockOutputTestCase, if self.RELEASE_TAG is not None: self._run.attrs.release_tag = self.RELEASE_TAG - portage_utilities._OVERLAY_LIST_CMD = '/bin/true' + portage_util._OVERLAY_LIST_CMD = '/bin/true' def tearDown(self): # Mimic exiting with statement for self._manager. diff --git a/cbuildbot/stages/sdk_stages.py b/cbuildbot/stages/sdk_stages.py index e22b285ed..d0cbf58c2 100644 --- a/cbuildbot/stages/sdk_stages.py +++ b/cbuildbot/stages/sdk_stages.py @@ -8,11 +8,11 @@ import json import os from chromite.cbuildbot import constants -from chromite.cbuildbot import portage_utilities from chromite.cbuildbot.stages import generic_stages from chromite.lib import cros_build_lib from chromite.lib import git from chromite.lib import osutils +from chromite.lib import portage_util class SDKPackageStage(generic_stages.BuilderStage): @@ -90,7 +90,7 @@ class SDKPackageStage(generic_stages.BuilderStage): dest_manifest: Path to the manifest that should be generated. """ package_data = {} - for key, version in portage_utilities.ListInstalledPackages(sdk_path): + for key, version in portage_util.ListInstalledPackages(sdk_path): package_data.setdefault(key, []).append((version, {})) self._WriteManifest(package_data, dest_manifest) diff --git a/cbuildbot/stages/sdk_stages_unittest.py b/cbuildbot/stages/sdk_stages_unittest.py index 93b1dacb3..50be2330f 100755 --- a/cbuildbot/stages/sdk_stages_unittest.py +++ b/cbuildbot/stages/sdk_stages_unittest.py @@ -11,12 +11,12 @@ import os import sys sys.path.insert(0, os.path.abspath('%s/../../..' % os.path.dirname(__file__))) -from chromite.cbuildbot import portage_utilities from chromite.cbuildbot.stages import sdk_stages from chromite.cbuildbot.stages import generic_stages_unittest from chromite.lib import cros_build_lib from chromite.lib import cros_test_lib from chromite.lib import osutils +from chromite.lib import portage_util # pylint: disable=R0901 @@ -37,7 +37,7 @@ class SDKStageTest(generic_stages_unittest.AbstractStageTest): osutils.SafeMakedirs(self.fake_chroot) osutils.Touch(os.path.join(self.fake_chroot, 'file')) for package, v in self.fake_packages: - cpv = portage_utilities.SplitCPV('%s-%s' % (package, v)) + cpv = portage_util.SplitCPV('%s-%s' % (package, v)) key = '%s/%s' % (cpv.category, cpv.package) self.fake_json_data.setdefault(key, []).append([v, {}]) @@ -53,11 +53,11 @@ class SDKStageTest(generic_stages_unittest.AbstractStageTest): fake_tarball = os.path.join(self.build_root, 'built-sdk.tar.xz') fake_manifest = os.path.join(self.build_root, 'built-sdk.tar.xz.Manifest') - self.mox.StubOutWithMock(portage_utilities, 'ListInstalledPackages') + self.mox.StubOutWithMock(portage_util, 'ListInstalledPackages') self.mox.StubOutWithMock(sdk_stages.SDKPackageStage, 'CreateRedistributableToolchains') - portage_utilities.ListInstalledPackages(self.fake_chroot).AndReturn( + portage_util.ListInstalledPackages(self.fake_chroot).AndReturn( self.fake_packages) # This code has its own unit tests, so no need to go testing it here. # pylint: disable=E1120 diff --git a/cbuildbot/validation_pool.py b/cbuildbot/validation_pool.py index b3564f181..fe98d1af7 100644 --- a/cbuildbot/validation_pool.py +++ b/cbuildbot/validation_pool.py @@ -23,7 +23,6 @@ from xml.dom import minidom from chromite.cbuildbot import cbuildbot_config from chromite.cbuildbot import failures_lib from chromite.cbuildbot import constants -from chromite.cbuildbot import portage_utilities from chromite.cbuildbot import lkgm_manager from chromite.cbuildbot import manifest_version from chromite.cbuildbot import metadata_lib @@ -36,6 +35,7 @@ from chromite.lib import gob_util from chromite.lib import gs from chromite.lib import parallel from chromite.lib import patch as cros_patch +from chromite.lib import portage_util from chromite.lib import timeout_util # Third-party libraries bundled with chromite need to be listed after the @@ -1261,7 +1261,7 @@ class CalculateSuspects(object): if not config: return None for board in config.boards: - overlays = portage_utilities.FindOverlays( + overlays = portage_util.FindOverlays( constants.BOTH_OVERLAYS, board, build_root) responsible_overlays.update(overlays) return responsible_overlays @@ -1317,7 +1317,7 @@ class CalculateSuspects(object): responsible_overlays = cls.GetResponsibleOverlays(build_root, messages) if responsible_overlays is None: return changes - all_overlays = set(portage_utilities.FindOverlays( + all_overlays = set(portage_util.FindOverlays( constants.BOTH_OVERLAYS, None, build_root)) manifest = git.ManifestCheckout.Cached(build_root) candidates = [] diff --git a/cros/commands/cros_deploy.py b/cros/commands/cros_deploy.py index db2ea13ff..0a672ff1b 100644 --- a/cros/commands/cros_deploy.py +++ b/cros/commands/cros_deploy.py @@ -9,8 +9,8 @@ import logging import urlparse from chromite import cros -from chromite.cbuildbot import portage_utilities from chromite.lib import cros_build_lib +from chromite.lib import portage_util from chromite.lib import remote_access @@ -103,8 +103,7 @@ For more information of cros build usage: def GetLatestPackage(self, board, pkg): """Returns the path to the latest |pkg| for |board|.""" sysroot = cros_build_lib.GetSysroot(board=board) - matches = portage_utilities.FindPackageNameMatches( - pkg, board=board) + matches = portage_util.FindPackageNameMatches(pkg, board=board) if not matches: raise ValueError('Package %s is not installed!' % pkg) @@ -127,7 +126,7 @@ For more information of cros build usage: logging.error('Cannot strip package %s', pkg) raise - return portage_utilities.GetBinaryPackagePath( + return portage_util.GetBinaryPackagePath( cpv.category, cpv.package, cpv.version, sysroot=sysroot, packages_dir=packages_dir) @@ -275,7 +274,7 @@ For more information of cros build usage: if self.clean_binpkg: logging.info('Cleaning outdated binary packages for %s', board) - portage_utilities.CleanOutdatedBinaryPackages(board) + portage_util.CleanOutdatedBinaryPackages(board) if not self._IsPathWritable(device, self.root): # Only remounts rootfs if the given root is not writable. diff --git a/cbuildbot/portage_utilities.py b/lib/portage_util.py index 3e4284961..3e4284961 100644 --- a/cbuildbot/portage_utilities.py +++ b/lib/portage_util.py diff --git a/cbuildbot/portage_utilities_unittest.py b/lib/portage_util_unittest.py index 0e51a9f1d..f158057e4 100755 --- a/cbuildbot/portage_utilities_unittest.py +++ b/lib/portage_util_unittest.py @@ -4,14 +4,14 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -"""Unit tests for portage_utilities.py.""" +"""Unit tests for portage_util.py.""" import fileinput import mox import os import sys -import constants +from chromite.cbuildbot import constants if __name__ == '__main__': sys.path.insert(0, constants.SOURCE_ROOT) @@ -19,7 +19,7 @@ from chromite.lib import cros_build_lib from chromite.lib import cros_test_lib from chromite.lib import git from chromite.lib import osutils -from chromite.cbuildbot import portage_utilities +from chromite.lib import portage_util # pylint: disable=W0212 MANIFEST = git.ManifestCheckout.Cached(constants.SOURCE_ROOT) @@ -48,7 +48,7 @@ class EBuildTest(cros_test_lib.MoxTestCase): self.mox.StubOutWithMock(fileinput, 'input') fileinput.input(fake_ebuild_path).AndReturn(fake_ebuild_content) self.mox.ReplayAll() - fake_ebuild = portage_utilities.EBuild(fake_ebuild_path) + fake_ebuild = portage_util.EBuild(fake_ebuild_path) self.mox.VerifyAll() return fake_ebuild @@ -102,7 +102,7 @@ class EBuildTest(cros_test_lib.MoxTestCase): cros_build_lib.RunCommand( mox.IgnoreArg(), cwd=mox.IgnoreArg(), - print_cmd=portage_utilities.EBuild.VERBOSE, + print_cmd=portage_util.EBuild.VERBOSE, capture_output=True).AndReturn(result) self.mox.ReplayAll() @@ -162,7 +162,7 @@ class ProjectAndPathTest(cros_test_lib.MoxTempDirTestCase): MANIFEST.FindCheckoutFromPath(mox.IgnoreArg()).AndReturn({ 'name': p }) self.mox.ReplayAll() - ebuild = portage_utilities.EBuild(ebuild_path) + ebuild = portage_util.EBuild(ebuild_path) result = ebuild.GetSourcePath(self.tempdir, MANIFEST) self.mox.VerifyAll() return result @@ -195,9 +195,9 @@ CROS_WORKON_SUBDIR=%s CROS_WORKON_PROJECT=%s CROS_WORKON_LOCALNAME=%s CROS_WORKON_SUBDIR=%s - """ % (portage_utilities.EBuild.FormatBashArray(fake_projects), - portage_utilities.EBuild.FormatBashArray(fake_localname), - portage_utilities.EBuild.FormatBashArray(fake_subdir)) + """ % (portage_util.EBuild.FormatBashArray(fake_projects), + portage_util.EBuild.FormatBashArray(fake_localname), + portage_util.EBuild.FormatBashArray(fake_subdir)) project, subdir = self._MockParseWorkonVariables( fake_projects, fake_localname, fake_subdir, fake_ebuild_contents) self.assertEquals(project, fake_projects) @@ -208,7 +208,7 @@ CROS_WORKON_SUBDIR=%s self.assertEquals(subdir, fake_path) -class StubEBuild(portage_utilities.EBuild): +class StubEBuild(portage_util.EBuild): """Test helper to StubEBuild.""" def __init__(self, path): super(StubEBuild, self).__init__(path) @@ -257,39 +257,39 @@ class EBuildRevWorkonTest(cros_test_lib.MoxTempDirTestCase): # pylint: disable=E1120 self.mox.StubOutWithMock(os.path, 'exists') self.mox.StubOutWithMock(cros_build_lib, 'Die') - self.mox.StubOutWithMock(portage_utilities.shutil, 'copyfile') + self.mox.StubOutWithMock(portage_util.shutil, 'copyfile') self.mox.StubOutWithMock(os, 'unlink') - self.mox.StubOutWithMock(portage_utilities.EBuild, '_RunGit') + self.mox.StubOutWithMock(portage_util.EBuild, '_RunGit') self.mox.StubOutWithMock(cros_build_lib, 'RunCommand') - self.mox.StubOutWithMock(portage_utilities.filecmp, 'cmp') - self.mox.StubOutWithMock(portage_utilities.fileinput, 'input') - self.mox.StubOutWithMock(portage_utilities.EBuild, 'GetVersion') - self.mox.StubOutWithMock(portage_utilities.EBuild, 'GetSourcePath') - self.mox.StubOutWithMock(portage_utilities.EBuild, 'GetTreeId') + self.mox.StubOutWithMock(portage_util.filecmp, 'cmp') + self.mox.StubOutWithMock(portage_util.fileinput, 'input') + self.mox.StubOutWithMock(portage_util.EBuild, 'GetVersion') + self.mox.StubOutWithMock(portage_util.EBuild, 'GetSourcePath') + self.mox.StubOutWithMock(portage_util.EBuild, 'GetTreeId') if multi: - portage_utilities.EBuild.GetSourcePath('/sources', MANIFEST).AndReturn( + portage_util.EBuild.GetSourcePath('/sources', MANIFEST).AndReturn( (['fake_project1','fake_project2'], ['p1_path1','p1_path2'])) else: - portage_utilities.EBuild.GetSourcePath('/sources', MANIFEST).AndReturn( + portage_util.EBuild.GetSourcePath('/sources', MANIFEST).AndReturn( (['fake_project1'], ['p1_path'])) - portage_utilities.EBuild.GetVersion('/sources', MANIFEST, - '0.0.1').AndReturn('0.0.1') + portage_util.EBuild.GetVersion('/sources', MANIFEST, '0.0.1').AndReturn( + '0.0.1') if multi: - portage_utilities.EBuild.GetTreeId('p1_path1').AndReturn('treehash1') - portage_utilities.EBuild.GetTreeId('p1_path2').AndReturn('treehash2') + portage_util.EBuild.GetTreeId('p1_path1').AndReturn('treehash1') + portage_util.EBuild.GetTreeId('p1_path2').AndReturn('treehash2') else: - portage_utilities.EBuild.GetTreeId('p1_path').AndReturn('treehash') + portage_util.EBuild.GetTreeId('p1_path').AndReturn('treehash') ebuild_9999 = self.m_ebuild._unstable_ebuild_path os.path.exists(ebuild_9999).AndReturn(True) # These calls come from MarkAsStable() - portage_utilities.shutil.copyfile(ebuild_9999, self.revved_ebuild_path) + portage_util.shutil.copyfile(ebuild_9999, self.revved_ebuild_path) m_file = self.mox.CreateMock(file) - portage_utilities.fileinput.input(self.revved_ebuild_path, - inplace=1).AndReturn(ebuild_content) + portage_util.fileinput.input(self.revved_ebuild_path, + inplace=1).AndReturn(ebuild_content) m_file.write('EAPI=2\n') if multi: @@ -303,15 +303,15 @@ class EBuildRevWorkonTest(cros_test_lib.MoxTempDirTestCase): m_file.write('src_unpack(){}\n') # MarkAsStable() returns here - portage_utilities.filecmp.cmp(self.m_ebuild.ebuild_path, - self.revved_ebuild_path, - shallow=False).AndReturn(not rev) + portage_util.filecmp.cmp(self.m_ebuild.ebuild_path, + self.revved_ebuild_path, + shallow=False).AndReturn(not rev) if rev: cmd = ['add', self.revved_ebuild_path] - portage_utilities.EBuild._RunGit(self.overlay, cmd) + portage_util.EBuild._RunGit(self.overlay, cmd) if self.m_ebuild.is_stable: cmd = ['rm', self.m_ebuild.ebuild_path] - portage_utilities.EBuild._RunGit(self.overlay, cmd) + portage_util.EBuild._RunGit(self.overlay, cmd) else: os.unlink(self.revved_ebuild_path) @@ -371,12 +371,12 @@ class EBuildRevWorkonTest(cros_test_lib.MoxTempDirTestCase): def testUpdateCommitHashesForChanges(self): """Tests that we can update the commit hashes for changes correctly.""" - cls = portage_utilities.EBuild + cls = portage_util.EBuild ebuild1 = self.mox.CreateMock(cls) ebuild1.ebuild_path = 'public_overlay/ebuild.ebuild' ebuild1.package = 'test/project' - self.mox.StubOutWithMock(portage_utilities, 'FindOverlays') + self.mox.StubOutWithMock(portage_util, 'FindOverlays') self.mox.StubOutWithMock(cls, '_GetEBuildPaths') self.mox.StubOutWithMock(cls, '_GetSHA1ForPath') self.mox.StubOutWithMock(cls, 'UpdateEBuild') @@ -388,7 +388,7 @@ class EBuildRevWorkonTest(cros_test_lib.MoxTempDirTestCase): changes = ['fake change'] paths = ['fake_path1', 'fake_path2'] path_ebuilds = {ebuild1: paths} - portage_utilities.FindOverlays( + portage_util.FindOverlays( constants.BOTH_OVERLAYS, buildroot=build_root).AndReturn(overlays) cls._GetEBuildPaths(build_root, mox.IgnoreArg(), overlays, changes).AndReturn(path_ebuilds) @@ -406,13 +406,13 @@ class EBuildRevWorkonTest(cros_test_lib.MoxTempDirTestCase): url = 'file://' + os.path.join(constants.SOURCE_ROOT, 'chromite') git.RunGit(self.tempdir, ['clone', '--depth=1', url, self.tempdir]) # No changes yet as we just cloned the repo. - self.assertFalse(portage_utilities.EBuild.GitRepoHasChanges(self.tempdir)) + self.assertFalse(portage_util.EBuild.GitRepoHasChanges(self.tempdir)) # Update metadata but no real changes. osutils.Touch(os.path.join(self.tempdir, 'LICENSE')) - self.assertFalse(portage_utilities.EBuild.GitRepoHasChanges(self.tempdir)) + self.assertFalse(portage_util.EBuild.GitRepoHasChanges(self.tempdir)) # A real change. osutils.WriteFile(os.path.join(self.tempdir, 'LICENSE'), 'hi') - self.assertTrue(portage_utilities.EBuild.GitRepoHasChanges(self.tempdir)) + self.assertTrue(portage_util.EBuild.GitRepoHasChanges(self.tempdir)) class FindOverlaysTest(cros_test_lib.MoxTestCase): @@ -429,7 +429,7 @@ class FindOverlaysTest(cros_test_lib.MoxTestCase): for b in (None, self.FAKE, self.MARIO): self.overlays[b] = d = {} for o in (self.PRIVATE, self.PUBLIC, self.BOTH, None): - d[o] = portage_utilities.FindOverlays(o, b, constants.SOURCE_ROOT) + d[o] = portage_util.FindOverlays(o, b, constants.SOURCE_ROOT) self.no_overlays = not bool(any(d.values())) def testMissingPrimaryOverlay(self): @@ -438,8 +438,8 @@ class FindOverlaysTest(cros_test_lib.MoxTestCase): If the overlay doesn't exist, FindOverlays should throw a MissingOverlayException. """ - self.assertRaises(portage_utilities.MissingOverlayException, - portage_utilities.FindPrimaryOverlay, self.BOTH, + self.assertRaises(portage_util.MissingOverlayException, + portage_util.FindPrimaryOverlay, self.BOTH, self.FAKE, constants.SOURCE_ROOT) def testDuplicates(self): @@ -507,8 +507,8 @@ class FindOverlaysTest(cros_test_lib.MoxTestCase): if self.no_overlays: return - mario_primary = portage_utilities.FindPrimaryOverlay(self.BOTH, self.MARIO, - constants.SOURCE_ROOT) + mario_primary = portage_util.FindPrimaryOverlay(self.BOTH, self.MARIO, + constants.SOURCE_ROOT) self.assertTrue(mario_primary in self.overlays[self.MARIO][self.BOTH]) self.assertTrue(mario_primary not in self.overlays[self.FAKE][self.BOTH]) self.assertEqual(mario_primary, self.overlays[self.MARIO][self.PUBLIC][-1]) @@ -523,8 +523,8 @@ class FindOverlaysTest(cros_test_lib.MoxTestCase): osutils.ReadFile(os.path.join(overlay, 'test')).AndRaise( IOError(os.errno.ENOENT, 'ENOENT')) self.mox.ReplayAll() - portage_utilities.ReadOverlayFile('test', self.PUBLIC, self.MARIO, - constants.SOURCE_ROOT) + portage_util.ReadOverlayFile('test', self.PUBLIC, self.MARIO, + constants.SOURCE_ROOT) self.mox.VerifyAll() @@ -540,12 +540,12 @@ class UtilFuncsTest(cros_test_lib.TempDirTestCase): def testGetOverlayNameNone(self): """If the overlay has no name, it should be fine""" - self.assertEqual(portage_utilities.GetOverlayName(self.tempdir), None) + self.assertEqual(portage_util.GetOverlayName(self.tempdir), None) def testGetOverlayNameProfilesRepoName(self): """Verify profiles/repo_name can be read""" self._CreateProfilesRepoName('hi!') - self.assertEqual(portage_utilities.GetOverlayName(self.tempdir), 'hi!') + self.assertEqual(portage_util.GetOverlayName(self.tempdir), 'hi!') def testGetOverlayNameProfilesLayoutConf(self): """Verify metadata/layout.conf is read before profiles/repo_name""" @@ -554,7 +554,7 @@ class UtilFuncsTest(cros_test_lib.TempDirTestCase): osutils.SafeMakedirs(metadata) layout_conf = os.path.join(metadata, 'layout.conf') osutils.WriteFile(layout_conf, 'repo-name = bye') - self.assertEqual(portage_utilities.GetOverlayName(self.tempdir), 'bye') + self.assertEqual(portage_util.GetOverlayName(self.tempdir), 'bye') def testGetOverlayNameProfilesLayoutConfNoRepoName(self): """Verify metadata/layout.conf w/out repo-name is ignored""" @@ -563,7 +563,7 @@ class UtilFuncsTest(cros_test_lib.TempDirTestCase): osutils.SafeMakedirs(metadata) layout_conf = os.path.join(metadata, 'layout.conf') osutils.WriteFile(layout_conf, 'here = we go') - self.assertEqual(portage_utilities.GetOverlayName(self.tempdir), 'hi!') + self.assertEqual(portage_util.GetOverlayName(self.tempdir), 'hi!') class BuildEBuildDictionaryTest(cros_test_lib.MoxTestCase): @@ -577,15 +577,15 @@ class BuildEBuildDictionaryTest(cros_test_lib.MoxTestCase): self.package_path = self.root + '/test_package-0.0.1.ebuild' paths = [[self.root, [], []]] os.walk("/overlay").AndReturn(paths) - self.mox.StubOutWithMock(portage_utilities, '_FindUprevCandidates') + self.mox.StubOutWithMock(portage_util, '_FindUprevCandidates') def testWantedPackage(self): overlays = {"/overlay": []} package = _Package(self.package) - portage_utilities._FindUprevCandidates([]).AndReturn(package) + portage_util._FindUprevCandidates([]).AndReturn(package) self.mox.ReplayAll() - portage_utilities.BuildEBuildDictionary(overlays, False, [self.package]) + portage_util.BuildEBuildDictionary(overlays, False, [self.package]) self.mox.VerifyAll() self.assertEquals(len(overlays), 1) self.assertEquals(overlays["/overlay"], [package]) @@ -593,9 +593,9 @@ class BuildEBuildDictionaryTest(cros_test_lib.MoxTestCase): def testUnwantedPackage(self): overlays = {"/overlay": []} package = _Package(self.package) - portage_utilities._FindUprevCandidates([]).AndReturn(package) + portage_util._FindUprevCandidates([]).AndReturn(package) self.mox.ReplayAll() - portage_utilities.BuildEBuildDictionary(overlays, False, []) + portage_util.BuildEBuildDictionary(overlays, False, []) self.assertEquals(len(overlays), 1) self.assertEquals(overlays["/overlay"], []) self.mox.VerifyAll() @@ -609,13 +609,13 @@ class ProjectMappingTest(cros_test_lib.TestCase): ebuild_path = 'chromeos-base/platform2/platform2-9999.ebuild' components = ['chromeos-base', 'platform2', 'platform2-9999'] for path in (ebuild_path, './' + ebuild_path, 'foo.bar/' + ebuild_path): - self.assertEquals(components, portage_utilities.SplitEbuildPath(path)) + self.assertEquals(components, portage_util.SplitEbuildPath(path)) def testSplitPV(self): """Test splitting PVs into package and version components.""" pv = 'bar-1.2.3_rc1-r5' package, version_no_rev, rev = tuple(pv.split('-')) - split_pv = portage_utilities.SplitPV(pv) + split_pv = portage_util.SplitPV(pv) self.assertEquals(split_pv.pv, pv) self.assertEquals(split_pv.package, package) self.assertEquals(split_pv.version_no_rev, version_no_rev) @@ -626,8 +626,8 @@ class ProjectMappingTest(cros_test_lib.TestCase): """Test splitting CPV into components.""" cpv = 'foo/bar-4.5.6_alpha-r6' cat, pv = cpv.split('/', 1) - split_pv = portage_utilities.SplitPV(pv) - split_cpv = portage_utilities.SplitCPV(cpv) + split_pv = portage_util.SplitPV(pv) + split_cpv = portage_util.SplitCPV(cpv) self.assertEquals(split_cpv.category, cat) for k, v in split_pv._asdict().iteritems(): self.assertEquals(getattr(split_cpv, k), v) @@ -643,10 +643,10 @@ class ProjectMappingTest(cros_test_lib.TestCase): ([kernel], set([kernel_project])), ([ply_image, kernel], set([ply_image_project, kernel_project])) ] - if portage_utilities.FindOverlays(constants.BOTH_OVERLAYS): + if portage_util.FindOverlays(constants.BOTH_OVERLAYS): for packages, projects in matches: self.assertEquals(projects, - portage_utilities.FindWorkonProjects(packages)) + portage_util.FindWorkonProjects(packages)) class PackageDBTest(cros_test_lib.MoxTempDirTestCase): """Package Database related tests.""" @@ -686,13 +686,13 @@ class PackageDBTest(cros_test_lib.MoxTempDirTestCase): continue # Correct pkg. osutils.Touch(os.path.join(pkgpath, pkg + '.ebuild')) - pv = portage_utilities.SplitPV(pkg) + pv = portage_util.SplitPV(pkg) key = '%s/%s' % (cat, pv.package) self.fake_packages.append((key, pv.version)) def testListInstalledPackages(self): """Test if listing packages installed into a root works.""" - packages = portage_utilities.ListInstalledPackages(self.fake_chroot) + packages = portage_util.ListInstalledPackages(self.fake_chroot) # Sort the lists, because the filesystem might reorder the entries for us. packages.sort() self.fake_packages.sort() @@ -700,10 +700,10 @@ class PackageDBTest(cros_test_lib.MoxTempDirTestCase): def testIsPackageInstalled(self): """Test if checking the existence of an installed package works.""" - self.assertTrue(portage_utilities.IsPackageInstalled( + self.assertTrue(portage_util.IsPackageInstalled( 'category1/package', sysroot=self.fake_chroot)) - self.assertFalse(portage_utilities.IsPackageInstalled( + self.assertFalse(portage_util.IsPackageInstalled( 'category1/foo', sysroot=self.fake_chroot)) diff --git a/lib/toolchain.py b/lib/toolchain.py index 08a925829..7d83ecb5a 100644 --- a/lib/toolchain.py +++ b/lib/toolchain.py @@ -9,10 +9,10 @@ import json import os from chromite.cbuildbot import constants -from chromite.cbuildbot import portage_utilities from chromite.lib import cros_build_lib from chromite.lib import gs from chromite.lib import osutils +from chromite.lib import portage_util if cros_build_lib.IsInsideChroot(): # Only import portage after we've checked that we're inside the chroot. @@ -89,7 +89,7 @@ def GetToolchainsForBoard(board, buildroot=constants.SOURCE_ROOT): Returns: The list of toolchain tuples for the given board """ - overlays = portage_utilities.FindOverlays( + overlays = portage_util.FindOverlays( constants.BOTH_OVERLAYS, None if board in ('all', 'sdk') else board, buildroot=buildroot) toolchains = GetTuplesForOverlays(overlays) diff --git a/licensing/licenses_lib.py b/licensing/licenses_lib.py index 38ac4e250..8e0600769 100644 --- a/licensing/licenses_lib.py +++ b/licensing/licenses_lib.py @@ -17,9 +17,9 @@ import re import tempfile from chromite.cbuildbot import constants -from chromite.cbuildbot import portage_utilities from chromite.lib import cros_build_lib from chromite.lib import osutils +from chromite.lib import portage_util # We are imported by src/repohooks/pre-upload.py in a non chroot environment # where yaml may not be there, so we don't error on that since it's not needed @@ -266,7 +266,7 @@ class PackageInfo(object): # category, name, version, revision # try: - cpv = portage_utilities.SplitCPV(fullnamerev) + cpv = portage_util.SplitCPV(fullnamerev) except TypeError: cpv = None @@ -371,7 +371,7 @@ class PackageInfo(object): filename = os.path.basename(self.fullnamerev) license_path = os.path.join(COPYRIGHT_ATTRIBUTION_DIR, os.path.dirname(self.fullnamerev)) - pv = portage_utilities.SplitPV(filename) + pv = portage_util.SplitPV(filename) pv_no_rev = '%s-%s' % (pv.package, pv.version_no_rev) for filename in (pv.pv, pv_no_rev, pv.package): file_path = os.path.join(license_path, filename) diff --git a/scripts/autotest_quickmerge.py b/scripts/autotest_quickmerge.py index df909088a..2063862c8 100644 --- a/scripts/autotest_quickmerge.py +++ b/scripts/autotest_quickmerge.py @@ -18,10 +18,10 @@ import sys from collections import namedtuple from chromite.cbuildbot import constants -from chromite.cbuildbot import portage_utilities from chromite.lib import cros_build_lib from chromite.lib import git from chromite.lib import osutils +from chromite.lib import portage_util if cros_build_lib.IsInsideChroot(): @@ -185,7 +185,7 @@ def GetPackageAPI(portage_root, package_cp): # Convert string match to package dblink. package_cpv = matching_packages[0] - package_split = portage_utilities.SplitCPV(package_cpv) + package_split = portage_util.SplitCPV(package_cpv) # pylint: disable-msg=E1101 package = portage.dblink(package_split.category, package_split.pv, settings=vartree.settings, diff --git a/scripts/cros_list_modified_packages.py b/scripts/cros_list_modified_packages.py index 3d0c0aa35..591680069 100644 --- a/scripts/cros_list_modified_packages.py +++ b/scripts/cros_list_modified_packages.py @@ -34,11 +34,11 @@ except ImportError: import queue as Queue from chromite.cbuildbot import constants -from chromite.cbuildbot import portage_utilities from chromite.lib import cros_build_lib from chromite.lib import git from chromite.lib import osutils from chromite.lib import parallel +from chromite.lib import portage_util class WorkonProjectsMonitor(object): @@ -159,13 +159,13 @@ def ListWorkonPackagesInfo(board, host): install_root = cros_build_lib.GetSysroot(board=board) vdb_path = os.path.join(install_root, portage.const.VDB_PATH) buildroot, both = constants.SOURCE_ROOT, constants.BOTH_OVERLAYS - for overlay in portage_utilities.FindOverlays(both, board, buildroot): - for filename, projects in portage_utilities.GetWorkonProjectMap(overlay, - packages): + for overlay in portage_util.FindOverlays(both, board, buildroot): + for filename, projects in portage_util.GetWorkonProjectMap(overlay, + packages): # chromeos-base/power_manager/power_manager-9999 # cp = chromeos-base/power_manager # cpv = chromeos-base/power_manager-9999 - category, pn, p = portage_utilities.SplitEbuildPath(filename) + category, pn, p = portage_util.SplitEbuildPath(filename) cp = '%s/%s' % (category, pn) cpv = '%s/%s' % (category, p) diff --git a/scripts/cros_list_overlays.py b/scripts/cros_list_overlays.py index c28ef2b2a..587c10262 100644 --- a/scripts/cros_list_overlays.py +++ b/scripts/cros_list_overlays.py @@ -8,10 +8,10 @@ from __future__ import print_function import os +from chromite.cbuildbot import constants from chromite.lib import commandline from chromite.lib import cros_build_lib -from chromite.cbuildbot import constants -from chromite.cbuildbot import portage_utilities +from chromite.lib import portage_util def _ParseArguments(argv): @@ -41,15 +41,15 @@ def main(argv): # Verify that a primary overlay exists. try: - primary_overlay = portage_utilities.FindPrimaryOverlay(*args) - except portage_utilities.MissingOverlayException as ex: + primary_overlay = portage_util.FindPrimaryOverlay(*args) + except portage_util.MissingOverlayException as ex: cros_build_lib.Die(str(ex)) # Get the overlays to print. if opts.primary_only: overlays = [primary_overlay] else: - overlays = portage_utilities.FindOverlays(*args) + overlays = portage_util.FindOverlays(*args) # Exclude any overlays in src/third_party, for backwards compatibility with # scripts that expected these to not be listed. diff --git a/scripts/cros_list_overlays_unittest.py b/scripts/cros_list_overlays_unittest.py index 5720f733b..a5b49d380 100755 --- a/scripts/cros_list_overlays_unittest.py +++ b/scripts/cros_list_overlays_unittest.py @@ -13,8 +13,8 @@ import sys sys.path.insert(0, os.path.join(os.path.dirname(os.path.realpath(__file__)), '..', '..')) -from chromite.cbuildbot import portage_utilities from chromite.lib import cros_test_lib +from chromite.lib import portage_util from chromite.scripts import cros_list_overlays @@ -22,8 +22,8 @@ class ListOverlaysTest(cros_test_lib.MockTestCase): """Tests for main()""" def setUp(self): - self.pfind_mock = self.PatchObject(portage_utilities, 'FindPrimaryOverlay') - self.find_mock = self.PatchObject(portage_utilities, 'FindOverlays') + self.pfind_mock = self.PatchObject(portage_util, 'FindPrimaryOverlay') + self.find_mock = self.PatchObject(portage_util, 'FindOverlays') def testSmoke(self): """Basic sanity check""" diff --git a/scripts/cros_mark_as_stable.py b/scripts/cros_mark_as_stable.py index 04e5fbc37..739d132e2 100644 --- a/scripts/cros_mark_as_stable.py +++ b/scripts/cros_mark_as_stable.py @@ -10,11 +10,11 @@ import os import sys from chromite.cbuildbot import constants -from chromite.cbuildbot import portage_utilities from chromite.lib import cros_build_lib from chromite.lib import git from chromite.lib import osutils from chromite.lib import parallel +from chromite.lib import portage_util # Commit message for uprevving Portage packages. @@ -228,7 +228,7 @@ def main(_argv): help='Prints out debug info.') (options, args) = parser.parse_args() - portage_utilities.EBuild.VERBOSE = options.verbose + portage_util.EBuild.VERBOSE = options.verbose if len(args) != 1: _PrintUsageAndDie('Must specify a valid command [commit, push]') @@ -255,7 +255,7 @@ def main(_argv): manifest = git.ManifestCheckout.Cached(options.srcroot) if command == 'commit': - portage_utilities.BuildEBuildDictionary(overlays, options.all, package_list) + portage_util.BuildEBuildDictionary(overlays, options.all, package_list) # Contains the array of packages we actually revved. revved_packages = [] @@ -281,7 +281,7 @@ def main(_argv): keys.insert(0, k) break - with parallel.BackgroundTaskRunner(portage_utilities.RegenCache) as queue: + with parallel.BackgroundTaskRunner(portage_util.RegenCache) as queue: for overlay in keys: ebuilds = overlays[overlay] if not os.path.isdir(overlay): @@ -329,7 +329,7 @@ def main(_argv): raise if messages: - portage_utilities.EBuild.CommitChange('\n\n'.join(messages), overlay) + portage_util.EBuild.CommitChange('\n\n'.join(messages), overlay) if cros_build_lib.IsInsideChroot(): # Regenerate caches if need be. We do this all the time to diff --git a/scripts/cros_mark_chrome_as_stable.py b/scripts/cros_mark_chrome_as_stable.py index f7050a34f..078331580 100644 --- a/scripts/cros_mark_chrome_as_stable.py +++ b/scripts/cros_mark_chrome_as_stable.py @@ -25,10 +25,10 @@ import sys import urlparse from chromite.cbuildbot import constants -from chromite.cbuildbot import portage_utilities from chromite.lib import cros_build_lib from chromite.lib import git from chromite.lib import gob_util +from chromite.lib import portage_util from chromite.lib import timeout_util from chromite.scripts import cros_mark_as_stable @@ -189,17 +189,17 @@ def _GetStickyEBuild(stable_ebuilds): elif len(sticky_ebuilds) > 1: cros_build_lib.Warning('More than one sticky ebuild found') - return portage_utilities.BestEBuild(sticky_ebuilds) + return portage_util.BestEBuild(sticky_ebuilds) -class ChromeEBuild(portage_utilities.EBuild): +class ChromeEBuild(portage_util.EBuild): """Thin sub-class of EBuild that adds a chrome_version field.""" chrome_version_re = re.compile(r'.*-(%s|9999).*' % ( _CHROME_VERSION_REGEX)) chrome_version = '' def __init__(self, path): - portage_utilities.EBuild.__init__(self, path) + portage_util.EBuild.__init__(self, path) re_match = self.chrome_version_re.match(self.ebuild_path_no_revision) if re_match: self.chrome_version = re_match.group(1) @@ -240,7 +240,7 @@ def FindChromeCandidates(package_dir): if not stable_ebuilds: cros_build_lib.Warning('Missing stable ebuild for %s' % package_dir) - return portage_utilities.BestEBuild(unstable_ebuilds), stable_ebuilds + return portage_util.BestEBuild(unstable_ebuilds), stable_ebuilds def FindChromeUprevCandidate(stable_ebuilds, chrome_rev, sticky_branch): @@ -284,7 +284,7 @@ def FindChromeUprevCandidate(stable_ebuilds, chrome_rev, sticky_branch): candidates.append(ebuild) if candidates: - return portage_utilities.BestEBuild(candidates) + return portage_util.BestEBuild(candidates) else: return None @@ -397,7 +397,7 @@ def MarkChromeEBuildAsStable(stable_candidate, unstable_ebuild, chrome_pn, if commit: chrome_variables[_CHROME_SVN_TAG] = commit - portage_utilities.EBuild.MarkAsStable( + portage_util.EBuild.MarkAsStable( unstable_ebuild.ebuild_path, new_ebuild_path, chrome_variables, make_stable=mark_stable) new_ebuild = ChromeEBuild(new_ebuild_path) @@ -419,7 +419,7 @@ def MarkChromeEBuildAsStable(stable_candidate, unstable_ebuild, chrome_pn, if stable_candidate and not stable_candidate.IsSticky(): git.RunGit(package_dir, ['rm', stable_candidate.ebuild_path]) - portage_utilities.EBuild.CommitChange( + portage_util.EBuild.CommitChange( _GIT_COMMIT_MESSAGE % {'chrome_pn': chrome_pn, 'chrome_rev': chrome_rev, 'chrome_version': chrome_version}, diff --git a/scripts/cros_mark_chrome_as_stable_unittest.py b/scripts/cros_mark_chrome_as_stable_unittest.py index b9e3e8935..0671a7714 100755 --- a/scripts/cros_mark_chrome_as_stable_unittest.py +++ b/scripts/cros_mark_chrome_as_stable_unittest.py @@ -18,11 +18,11 @@ from textwrap import dedent sys.path.insert(0, os.path.join(os.path.dirname(os.path.realpath(__file__)), '..', '..')) from chromite.cbuildbot import constants -from chromite.cbuildbot import portage_utilities from chromite.lib import cros_build_lib from chromite.lib import cros_test_lib from chromite.lib import git from chromite.lib import gob_util +from chromite.lib import portage_util from chromite.scripts import cros_mark_chrome_as_stable # pylint: disable=W0212,R0904 @@ -280,7 +280,7 @@ class CrosMarkChromeAsStable(cros_test_lib.MoxTempDirTestCase): """ self.mox.StubOutWithMock(cros_build_lib, 'RunCommand') self.mox.StubOutWithMock(git, 'RunGit') - self.mox.StubOutWithMock(portage_utilities.EBuild, 'CommitChange') + self.mox.StubOutWithMock(portage_util.EBuild, 'CommitChange') stable_candidate = cros_mark_chrome_as_stable.ChromeEBuild(old_ebuild_path) unstable_ebuild = cros_mark_chrome_as_stable.ChromeEBuild(self.unstable) chrome_pn = 'chromeos-chrome' @@ -290,7 +290,7 @@ class CrosMarkChromeAsStable(cros_test_lib.MoxTempDirTestCase): git.RunGit(package_dir, ['add', new_ebuild_path]) git.RunGit(package_dir, ['rm', old_ebuild_path]) - portage_utilities.EBuild.CommitChange( + portage_util.EBuild.CommitChange( mox.StrContains(commit_string_indicator), package_dir) self.mox.ReplayAll() diff --git a/scripts/generate_delta_sysroot.py b/scripts/generate_delta_sysroot.py index 65b23d9f4..f512c5d0e 100644 --- a/scripts/generate_delta_sysroot.py +++ b/scripts/generate_delta_sysroot.py @@ -11,11 +11,11 @@ complete sysroot from extracted prebuilt packages. import os -from chromite.cbuildbot import portage_utilities +from chromite.cbuildbot import constants +from chromite.lib import commandline from chromite.lib import cros_build_lib from chromite.lib import osutils -from chromite.lib import commandline -from chromite.cbuildbot import constants +from chromite.lib import portage_util _CREATE_BATCH_CMD = ('rsync',) _CREATE_BATCH_EXCLUDE = ('--exclude=/tmp/', '--exclude=/var/cache/', @@ -110,7 +110,7 @@ def GenerateSysroot(sysroot, board, build_tests, unpack_only=False): cmd.append('--nowithautotest') env = {'USE': os.environ.get('USE', ''), 'PORTAGE_BINHOST': 'file://localhost%s' % - portage_utilities.GetBinaryPackageDir(board)} + portage_util.GetBinaryPackageDir(board)} cros_build_lib.RunCommand(cmd, extra_env=env) diff --git a/scripts/upload_prebuilts.py b/scripts/upload_prebuilts.py index b2118478b..3303f02ac 100644 --- a/scripts/upload_prebuilts.py +++ b/scripts/upload_prebuilts.py @@ -29,7 +29,6 @@ import tempfile from chromite.cbuildbot import constants from chromite.cbuildbot import commands -from chromite.cbuildbot import portage_utilities from chromite.lib import binpkg from chromite.lib import commandline from chromite.lib import cros_build_lib @@ -37,6 +36,7 @@ from chromite.lib import git from chromite.lib import gs from chromite.lib import osutils from chromite.lib import parallel +from chromite.lib import portage_util from chromite.lib import toolchain # How many times to retry uploads. @@ -247,8 +247,8 @@ def GetBoardOverlay(build_path, target): The last overlay configured for the given board as a string. """ board = target.board_variant - overlays = portage_utilities.FindOverlays(constants.BOTH_OVERLAYS, board, - buildroot=build_path) + overlays = portage_util.FindOverlays(constants.BOTH_OVERLAYS, board, + buildroot=build_path) # We only care about the last entry. return overlays[-1] |