portage_util: Readd CROS_WORKON_SUBDIR compatibility.
CROS_WORKON_SUBDIR support was removed in
https://crbug.com/805569. This CL readds that support behind a
conditional flag.
That flag should be set only when processing branches older than
10363.0.0. This logic should be removed after all branches older than
that are EOL'd (including firmware / factory).
DO NOT SUBMIT, CONCEPT REVIEW ONLY.
This version works against the daisy_skate branch, but still needs
cleanup.
BUG=chromium:890017
TEST=run_tests
Change-Id: Ie7ac7f7fe137e6d99fb178e14f3d5a0fcae9066c
Reviewed-on: https://chromium-review.googlesource.com/1257944
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Don Garrett <dgarrett@chromium.org>
Reviewed-by: Don Garrett <dgarrett@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
diff --git a/scripts/cros_mark_as_stable.py b/scripts/cros_mark_as_stable.py
index e09bccb..bf82935 100644
--- a/scripts/cros_mark_as_stable.py
+++ b/scripts/cros_mark_as_stable.py
@@ -19,6 +19,8 @@
from chromite.lib import portage_util
from chromite.lib import repo_util
+from chromite.cbuildbot import manifest_version
+
# Commit message subject for uprevving Portage packages.
GIT_COMMIT_SUBJECT = 'Marking set of ebuilds as stable'
@@ -383,8 +385,13 @@
Returns:
A dict mapping each overlay to a list of ebuilds belonging to it.
"""
+ root_version = manifest_version.VersionInfo.from_repo(options.buildroot)
+ subdir_removal = manifest_version.VersionInfo('10363.0.0')
+ require_subdir_support = root_version < subdir_removal
+
overlay_ebuilds = {}
- inputs = [[overlay, options.all, package_list, options.force]
+ inputs = [[overlay, options.all, package_list, options.force,
+ require_subdir_support]
for overlay in overlays]
result = parallel.RunTasksInProcessPool(
portage_util.GetOverlayEBuilds, inputs)
@@ -499,7 +506,7 @@
if options.list_revisions:
info = ebuild.GetSourceInfo(os.path.join(options.buildroot, 'src'),
- manifest)
+ manifest, True)
srcdirs = [os.path.join(options.buildroot, 'src', srcdir)
for srcdir in ebuild.cros_workon_vars.localname]
old_commit_ids = dict(