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>
diff --git a/scripts/autotest_quickmerge.py b/scripts/autotest_quickmerge.py
index df90908..2063862 100644
--- a/scripts/autotest_quickmerge.py
+++ b/scripts/autotest_quickmerge.py
@@ -18,10 +18,10 @@
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 @@
# 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,