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 3/7] EdkRepo: Update
Checkout for archived combos
Now either an active or archived branch combination can be checked out.
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/common/common_repo_functions.py | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/edkrepo/common/common_repo_functions.py
b/edkrepo/common/common_repo_functions.py
index 288dd27..160127b 100644
--- a/edkrepo/common/common_repo_functions.py
+++ b/edkrepo/common/common_repo_functions.py
@@ -494,8 +494,14 @@ def sort_commits(manifest, workspace_path,
max_commits=None):
return sorted_commit_list
-def combination_is_in_manifest(combination, manifest):
+def combinations_in_manifest(manifest):
combination_names = [c.name for c in manifest.combinations]
+ combination_names.extend([c.name for c in manifest.archived_combinations])
+ return combination_names
+
+
+def combination_is_in_manifest(combination, manifest):
+ combination_names = combinations_in_manifest(manifest)
return combination in combination_names
@@ -557,7 +563,7 @@ def checkout(combination_or_sha, verbose=False,
override=False, log=None):
combo_or_sha = combination_or_sha
try:
# Try to handle normalize combo name to match the manifest file.
- combo_or_sha = case_insensitive_single_match(combo_or_sha, [x.name for
x in manifest.combinations])
+ combo_or_sha = case_insensitive_single_match(combo_or_sha,
combinations_in_manifest())
except:
# No match so leave it alone. It must be a SHA1 or a bad combo name.
pass
--
2.21.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#56871): https://edk2.groups.io/g/devel/message/56871
Mute This Topic: https://groups.io/mt/72688779/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
