From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web12.743.1583822017336451774 for ; Mon, 09 Mar 2020 23:33:37 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.24, mailfrom: nathaniel.l.desimone@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Mar 2020 23:33:36 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,535,1574150400"; d="scan'208";a="276824421" Received: from orsmsx107.amr.corp.intel.com ([10.22.240.5]) by fmsmga002.fm.intel.com with ESMTP; 09 Mar 2020 23:33:36 -0700 Received: from orsmsx161.amr.corp.intel.com (10.22.240.84) by ORSMSX107.amr.corp.intel.com (10.22.240.5) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 9 Mar 2020 23:33:36 -0700 Received: from orsmsx114.amr.corp.intel.com ([169.254.8.140]) by ORSMSX161.amr.corp.intel.com ([169.254.4.11]) with mapi id 14.03.0439.000; Mon, 9 Mar 2020 23:33:36 -0700 From: "Nate DeSimone" To: "Desimone, Ashley E" , "devel@edk2.groups.io" CC: "Pandya, Puja" , "Bjorge, Erik C" Subject: Re: [edk2-staging/EdkRepo] [PATCH] EdkRepo: Correct typo in error strings Thread-Topic: [edk2-staging/EdkRepo] [PATCH] EdkRepo: Correct typo in error strings Thread-Index: AQHV8pBOWpkb5aNCTEW6PZHjeJv08KhBZnCw Date: Tue, 10 Mar 2020 06:33:35 +0000 Message-ID: <02A34F284D1DA44BB705E61F7180EF0AB5DBCD85@ORSMSX114.amr.corp.intel.com> References: <20200305014922.11740-1-ashley.e.desimone@intel.com> In-Reply-To: <20200305014922.11740-1-ashley.e.desimone@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiZTFmNGY4MjUtNWJjOS00MmE3LTgyYWMtNGNiODkyNWJkOTJmIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiRWFMZUNRREtnVUQ4czg3bEtXdk5nQzlYQ1FtQmRxMU1IeHorM2l1VDZvOTEwd1wvU0NQUjY0ZVlXeStcL1FJMG54In0= x-ctpclassification: CTP_NT x-originating-ip: [10.22.254.140] MIME-Version: 1.0 Return-Path: nathaniel.l.desimone@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Nate DeSimone -----Original Message----- From: Desimone, Ashley E =20 Sent: Wednesday, March 4, 2020 5:49 PM To: devel@edk2.groups.io Cc: Desimone, Nathaniel L ; Pandya, Puja ; Bjorge, Erik C Subject: [edk2-staging/EdkRepo] [PATCH] EdkRepo: Correct typo in error stri= ngs Fix typo of successfully Signed-off-by: Ashley E Desimone Cc: Nate DeSimone Cc: Puja Pandya Cc: Erik Bjorge --- edkrepo/common/common_repo_functions.py | 2 +- edkrepo/common/humble.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/edkrepo/common/common_repo_functions.py b/edkrepo/common/commo= n_repo_functions.py index d857d09..56ae307 100644 --- a/edkrepo/common/common_repo_functions.py +++ b/edkrepo/common/common_repo_functions.py @@ -39,7 +39,7 @@ from edkrepo.common.humble import SPARSE_CHECKOUT from e= dkrepo.common.humble import SPARSE_RESET from edkrepo.common.humble import= CHECKING_OUT_COMBO from edkrepo.common.humble import CHECKOUT_INVALID_COM= BO -from edkrepo.common.humble import CHECKOUT_COMBO_UNSUCCESFULL +from edkrepo.common.humble import CHECKOUT_COMBO_UNSUCCESSFULL from edkrepo.common.humble import GEN_A_NOT_IN_B, GEN_FOUND_MULT_A_IN_B f= rom edkrepo.common.humble import COMMIT_TEMPLATE_NOT_FOUND, COMMIT_TEMPLATE= _CUSTOM_VALUE from edkrepo.common.humble import ADD_PRIMARY_REMOTE, REMOVE= _PRIMARY_REMOTE diff --git a/edkrepo/common/humble.py b/edkrepo/common/humb= le.py index 3ad03ac..f0fbd29 100644 --- a/edkrepo/common/humble.py +++ b/edkrepo/common/humble.py @@ -83,7 +83,7 @@ CHECKOUT_INVALID_COMBO =3D UNSUPPORTED_COMBO + CHECKOUT_E= XIT CHECKOUT_CURRENT_COMBO =3D 'The selected combination, {0}, is already = checked out ' + CHECKOUT_EXIT CHECKOUT_UNCOMMITED_CHANGES =3D 'Uncommited = changes present in workspace, unable to complete checkout.\nTo discard all = local changes to tracked files rerun edkrepo checkout with the "--override"= flag.\n' CHECKOUT_NO_REMOTE =3D 'The specified remote branch for the {0} repo does = not exist.' -CHECKOUT_COMBO_UNSUCCESFULL =3D 'The combination {} was not able to be che= cked out succesfully. Returning to initially active combination.' +CHECKOUT_COMBO_UNSUCCESSFULL =3D 'The combination {} was not able to be ch= ecked out successfully. Returning to initially active combination.' =20 # Informational messages for checkout_command.py CHECKING_OUT_COMBO =3D '= Checking out combination: {0} ...' @@ -146,4 +146,4 @@ VERIFY_PROJ_NOT_IN_INDEX =3D 'Unable to find and entry = in the CiIndex for project: VERIFY_PROJ_FAIL =3D 'Unable to verify the global manifest repository entr= y for project: {}\n' =20 # Git Command Error Messages -GIT_CMD_ERROR =3D 'The git command: {} failed to complete succesfully with= the following errors.\n' +GIT_CMD_ERROR =3D 'The git command: {} failed to complete successfully wit= h the following errors.\n' -- 2.16.2.windows.1