From nobody Sat May 4 15:00:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+55465+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+55465+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1583372969; cv=none; d=zohomail.com; s=zohoarc; b=C31OQPv26z6flGBzJuJfhcXgQcgo+zv0Z9kJQVRtRp9su5Pv1/f5N/bPlJHKEUgHl5mJmZOwNP9Vvdj45iJZzws82JDqYsIfBz3+sPTir35NpzdFPAcVNIIo5Arxn8FzAdyAs4+hmbTfF0MrXQ6Ov8Pa3tCK1pgx0bgpKrJ6Cdc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583372969; h=Cc:Date:From:List-Id:List-Unsubscribe:Message-ID:Reply-To:Sender:Subject:To; bh=jMWBq6jqU4lYgpsfFkzSZCPQ7MHyOuApAl/z9aH4XVs=; b=jBz8onYxWWGAETm8PW5gifCCuqKVJ/E8o1+9Y5ZiJhOhzSXNd8BFBkGjZPSLjUrIv8W9jEo0w11foEHGIFoj3E6iPeCO1wQ/k14JqUk/3JPfhvjTl5dDReIxfovsyJin1ni4WxZiUG1jYkK4h5wIns2pufnMGp9Og/kVOCw2AHI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+55465+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1583372969063840.2587243759654; Wed, 4 Mar 2020 17:49:29 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id JY4GYY1788612x1PuQFIk8s1; Wed, 04 Mar 2020 17:49:28 -0800 X-Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mx.groups.io with SMTP id smtpd.web10.6639.1583372967983993840 for ; Wed, 04 Mar 2020 17:49:28 -0800 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Mar 2020 17:49:27 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,516,1574150400"; d="scan'208";a="320012802" X-Received: from aedesimo-desk.amr.corp.intel.com ([10.7.159.171]) by orsmga001.jf.intel.com with ESMTP; 04 Mar 2020 17:49:27 -0800 From: "Desimone, Ashley E" To: devel@edk2.groups.io Cc: Nate DeSimone , Puja Pandya , Erik Bjorge Subject: [edk2-devel] [edk2-staging/EdkRepo] [PATCH] EdkRepo: Correct typo in error strings Date: Wed, 4 Mar 2020 17:49:22 -0800 Message-Id: <20200305014922.11740-1-ashley.e.desimone@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,ashley.e.desimone@intel.com X-Gm-Message-State: aDb40HaAALmWa2SQglkFF6N1x1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1583372968; bh=dHO0wzITMDUaFDLIg/mPbsPVr04zFCGVqvspYv8KHvg=; h=Cc:Date:From:Reply-To:Subject:To; b=aRtMIS015lp8l2qc8CBkCYxD2Z/nqoLP9Ik661+ig1Fw4GrBxOh4h5Na3TC9d09DyT7 lDauqYLKWdZylvIS5Mly3Zo35YrQNhMdWQIuLrGkXeNHQhZlglr0P6IFXAkJYO7hJEl0M iSzmseAQeH+yQreGcPYL1dZuKefPB+dsaWc= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Fix typo of successfully Signed-off-by: Ashley E Desimone Cc: Nate DeSimone Cc: Puja Pandya Cc: Erik Bjorge Reviewed-by: Nate DeSimone Reviewed-by: Puja Pandya --- 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 edkrepo.common.humble import SPARSE_RESET from edkrepo.common.humble import CHECKING_OUT_COMBO from edkrepo.common.humble import CHECKOUT_INVALID_COMBO -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 from edkrepo.common.humble import COMMIT_TEMPLATE_NOT_FOUND, COMMIT_TEMPLA= TE_CUSTOM_VALUE from edkrepo.common.humble import ADD_PRIMARY_REMOTE, REMOVE_PRIMARY_REMOTE diff --git a/edkrepo/common/humble.py b/edkrepo/common/humble.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 chec= ked 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' --=20 2.16.2.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#55465): https://edk2.groups.io/g/devel/message/55465 Mute This Topic: https://groups.io/mt/71740651/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-