public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Bjorge, Erik C" <erik.c.bjorge@intel.com>
To: devel@edk2.groups.io
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>,
	Puja Pandya <puja.pandya@intel.com>,
	Bret Barkelew <Bret.Barkelew@microsoft.com>,
	Prince Agyeman <prince.agyeman@intel.com>
Subject: [edk2-staging/EdkRepo] [PATCH v1 5/7] EdkRepo: Update Checkout Pin for archived combos
Date: Tue, 31 Mar 2020 15:42:01 -0700	[thread overview]
Message-ID: <03d0594155577e47d537cb35f1a9dfe474108ab2.1585694095.git.erik.c.bjorge@intel.com> (raw)
In-Reply-To: <cover.1585694095.git.erik.c.bjorge@intel.com>

Added support for archived combos in the Checkout Pin command.

Signed-off-by: Erik Bjorge <erik.c.bjorge@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Puja Pandya <puja.pandya@intel.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Cc: Prince Agyeman <prince.agyeman@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


  parent reply	other threads:[~2020-03-31 22:43 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-31 22:41 [edk2-staging/EdkRepo] [PATCH v1 0/7] Adding support for archiving branch combos Bjorge, Erik C
2020-03-31 22:41 ` [edk2-staging/EdkRepo] [PATCH v1 1/7] EdkRepo: Adding support for archiving combos Bjorge, Erik C
2020-04-01 21:39   ` [edk2-devel] " Desimone, Ashley E
2020-03-31 22:41 ` [edk2-staging/EdkRepo] [PATCH v1 2/7] EdkRepo: Added ability to display archived combinations Bjorge, Erik C
2020-04-01 21:54   ` [edk2-devel] " Desimone, Ashley E
2020-03-31 22:41 ` [edk2-staging/EdkRepo] [PATCH v1 3/7] EdkRepo: Update Checkout for archived combos Bjorge, Erik C
2020-04-01 22:00   ` [edk2-devel] " Desimone, Ashley E
2020-03-31 22:42 ` [edk2-staging/EdkRepo] [PATCH v1 4/7] EdkRepo: Update Sync " Bjorge, Erik C
2020-04-01 22:05   ` [edk2-devel] " Desimone, Ashley E
2020-03-31 22:42 ` Bjorge, Erik C [this message]
2020-04-01 22:08   ` [edk2-devel] [edk2-staging/EdkRepo] [PATCH v1 5/7] EdkRepo: Update Checkout Pin " Desimone, Ashley E
2020-03-31 22:42 ` [edk2-staging/EdkRepo] [PATCH v1 6/7] EdkRepo: Update clone " Bjorge, Erik C
2020-04-01 22:10   ` [edk2-devel] " Desimone, Ashley E
2020-03-31 22:42 ` [edk2-staging/EdkRepo] [PATCH v1 7/7] EdkRepo: Update List Repos " Bjorge, Erik C
2020-04-01 22:16   ` [edk2-devel] " Desimone, Ashley E
2020-04-02  5:59 ` [edk2-devel] [edk2-staging/EdkRepo] [PATCH v1 0/7] Adding support for archiving branch combos Nate DeSimone
2020-04-02 17:02   ` Bjorge, Erik C
2020-04-03 22:27 ` Nate DeSimone

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=03d0594155577e47d537cb35f1a9dfe474108ab2.1585694095.git.erik.c.bjorge@intel.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox