From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web12.9320.1585956455493041172 for ; Fri, 03 Apr 2020 16:27:35 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.115, mailfrom: nathaniel.l.desimone@intel.com) IronPort-SDR: qkURz4bnnoyLIPDkFOFfp6HYidXqxy6bpXG9Bhsc6eZzwqoZqcuFVZmh7T+28fIDAORx5eZWtE xyEg6pTgtj4Q== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Apr 2020 16:27:35 -0700 IronPort-SDR: NlUsmootpaYN5M1g5vEdC57CV1H0eEzBl0IkhyzK5daBCLNFg6eIeULoVgCEX/FcWaTR99Xuhj jSe/+gjNsESQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,341,1580803200"; d="scan'208";a="268504162" Received: from nldesimo-desk1.amr.corp.intel.com ([10.7.159.63]) by orsmga002.jf.intel.com with ESMTP; 03 Apr 2020 16:27:34 -0700 From: "Nate DeSimone" To: devel@edk2.groups.io Cc: Ashley DeSimone , Puja Pandya , Erik Bjorge , Prince Agyeman , Bret Barkelew , Philippe Mathieu-Daude Subject: [edk2-staging/EdkRepo] [PATCH] EdkRepo: Checkout command is broken Date: Fri, 3 Apr 2020 16:27:23 -0700 Message-Id: <20200403232723.2377-1-nathaniel.l.desimone@intel.com> X-Mailer: git-send-email 2.26.0.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Fixes a bug where function call to combinations_in_manifest() was missing a required parameter. Signed-off-by: Nate DeSimone Cc: Ashley DeSimone Cc: Puja Pandya Cc: Erik Bjorge Cc: Prince Agyeman Cc: Bret Barkelew Cc: Philippe Mathieu-Daude --- 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