public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Ashley E Desimone" <ashley.e.desimone@intel.com>
To: "devel@edk2.groups.io" <devel@edk2.groups.io>,
	"Desimone, Nathaniel L" <nathaniel.l.desimone@intel.com>
Cc: "Pandya, Puja" <puja.pandya@intel.com>,
	"Bjorge, Erik C" <erik.c.bjorge@intel.com>,
	"Agyeman, Prince" <prince.agyeman@intel.com>,
	"Bret Barkelew" <Bret.Barkelew@microsoft.com>,
	Philippe Mathieu-Daude <philmd@redhat.com>
Subject: Re: [edk2-devel] [edk2-staging/EdkRepo] [PATCH] EdkRepo: Checkout command is broken
Date: Mon, 6 Apr 2020 18:34:46 +0000	[thread overview]
Message-ID: <DM6PR11MB362834EB4A9A40EA9A4212D1B2C20@DM6PR11MB3628.namprd11.prod.outlook.com> (raw)
In-Reply-To: <20200403232723.2377-1-nathaniel.l.desimone@intel.com>

Reviewed-by: Ashley DeSimone <ashley.e.desimone@intel.com>

-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Nate DeSimone
Sent: Friday, April 3, 2020 4:27 PM
To: devel@edk2.groups.io
Cc: Desimone, Ashley E <ashley.e.desimone@intel.com>; Pandya, Puja <puja.pandya@intel.com>; Bjorge, Erik C <erik.c.bjorge@intel.com>; Agyeman, Prince <prince.agyeman@intel.com>; Bret Barkelew <Bret.Barkelew@microsoft.com>; Philippe Mathieu-Daude <philmd@redhat.com>
Subject: [edk2-devel] [edk2-staging/EdkRepo] [PATCH] EdkRepo: Checkout command is broken

Fixes a bug where function call to combinations_in_manifest() was missing a required parameter.

Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Ashley DeSimone <ashley.e.desimone@intel.com>
Cc: Puja Pandya <puja.pandya@intel.com>
Cc: Erik Bjorge <erik.c.bjorge@intel.com>
Cc: Prince Agyeman <prince.agyeman@intel.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Cc: Philippe Mathieu-Daude <philmd@redhat.com>
---
 edkrepo/common/common_repo_functions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edkrepo/common/common_repo_functions.py b/edkrepo/common/common_repo_functions.py
index 160127b..0d39291 100644
--- a/edkrepo/common/common_repo_functions.py
+++ b/edkrepo/common/common_repo_functions.py
@@ -563,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, combinations_in_manifest())
+        combo_or_sha = case_insensitive_single_match(combo_or_sha, 
+ combinations_in_manifest(manifest))
     except:
         # No match so leave it alone.  It must be a SHA1 or a bad combo name.
         pass
--
2.26.0.windows.1





      parent reply	other threads:[~2020-04-06 18:35 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-03 23:27 [edk2-staging/EdkRepo] [PATCH] EdkRepo: Checkout command is broken Nate DeSimone
2020-04-06 16:51 ` [edk2-devel] " Bjorge, Erik C
2020-04-06 18:34 ` Ashley E Desimone [this message]

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=DM6PR11MB362834EB4A9A40EA9A4212D1B2C20@DM6PR11MB3628.namprd11.prod.outlook.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