Reviewed-by: Ashley DeSimone <ashley.e.desim...@intel.com>
-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Bjorge, Erik C
Sent: Tuesday, March 31, 2020 3:42 PM
To: devel@edk2.groups.io
Cc: Desimone, Nathaniel L <nathaniel.l.desim...@intel.com>; Pandya, Puja
<puja.pan...@intel.com>; Bret Barkelew <bret.barke...@microsoft.com>; Agyeman,
Prince <prince.agye...@intel.com>
Subject: [edk2-devel] [edk2-staging/EdkRepo] [PATCH v1 5/7] EdkRepo: Update
Checkout Pin for archived combos
Added support for archived combos in the Checkout Pin command.
Signed-off-by: Erik Bjorge <erik.c.bjo...@intel.com>
Cc: Nate DeSimone <nathaniel.l.desim...@intel.com>
Cc: Puja Pandya <puja.pan...@intel.com>
Cc: Bret Barkelew <bret.barke...@microsoft.com>
Cc: Prince Agyeman <prince.agye...@intel.com>
---
edkrepo/commands/checkout_pin_command.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/edkrepo/commands/checkout_pin_command.py
b/edkrepo/commands/checkout_pin_command.py
index a2afc41..858271a 100644
--- a/edkrepo/commands/checkout_pin_command.py
+++ b/edkrepo/commands/checkout_pin_command.py
@@ -15,7 +15,7 @@ from edkrepo.commands.edkrepo_command import EdkrepoCommand,
OverrideArgument import edkrepo.commands.arguments.checkout_pin_args as
arguments import edkrepo.commands.humble.checkout_pin_humble as humble from
edkrepo.common.common_repo_functions import sparse_checkout_enabled,
reset_sparse_checkout, sparse_checkout -from
edkrepo.common.common_repo_functions import check_dirty_repos, checkout_repos
+from edkrepo.common.common_repo_functions import check_dirty_repos,
+checkout_repos, combinations_in_manifest
from edkrepo.common.humble import SPARSE_CHECKOUT, SPARSE_RESET from
edkrepo.common.edkrepo_exception import EdkrepoInvalidParametersException,
EdkrepoProjectMismatchException from edkrepo.config.config_factory import
get_workspace_path, get_workspace_manifest @@ -89,7 +89,7 @@ class
CheckoutPinCommand(EdkrepoCommand):
raise EdkrepoProjectMismatchException(humble.MANIFEST_MISMATCH)
elif not set(pin.remotes).issubset(set(manifest.remotes)):
raise EdkrepoProjectMismatchException(humble.MANIFEST_MISMATCH)
- elif pin.general_config.current_combo not in [c.name for c in
manifest.combinations]:
+ elif pin.general_config.current_combo not in
combinations_in_manifest(manifest):
raise EdkrepoProjectMismatchException(humble.MANIFEST_MISMATCH)
combo_name = pin.general_config.current_combo
pin_sources = pin.get_repo_sources(combo_name)
--
2.21.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#56873): https://edk2.groups.io/g/devel/message/56873
Mute This Topic: https://groups.io/mt/72688782/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
