1. Patchew
  2. EDK2
  3. View series

[edk2-devel] [edk2-staging/EdkRepo] [PATCH] EdkRepo: Correct typo in error strings

Desimone, Ashley E posted 1 patch 4 years, 1 month ago
Failed in applying to current master (apply log)
edkrepo/common/common_repo_functions.py | 2 +-
edkrepo/common/humble.py                | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
[edk2-devel] [edk2-staging/EdkRepo] [PATCH] EdkRepo: Correct typo in error strings
Posted by Desimone, Ashley E 4 years, 1 month ago 
Fix typo of successfully

Signed-off-by: Ashley E Desimone <ashley.e.desimone@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Puja Pandya <puja.pandya@intel.com>
Cc: Erik Bjorge <erik.c.bjorge@intel.com>
---
 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/common_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_TEMPLATE_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 = UNSUPPORTED_COMBO + CHECKOUT_EXIT
 CHECKOUT_CURRENT_COMBO = 'The selected combination, {0}, is already checked out ' + CHECKOUT_EXIT
 CHECKOUT_UNCOMMITED_CHANGES = '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 = 'The specified remote branch for the {0} repo does not exist.'
-CHECKOUT_COMBO_UNSUCCESFULL = 'The combination {} was not able to be checked out succesfully. Returning to initially active combination.'
+CHECKOUT_COMBO_UNSUCCESSFULL = 'The combination {} was not able to be checked out successfully. Returning to initially active combination.'
 
 # Informational messages for checkout_command.py
 CHECKING_OUT_COMBO = 'Checking out combination: {0} ...'
@@ -146,4 +146,4 @@ VERIFY_PROJ_NOT_IN_INDEX = 'Unable to find and entry in the CiIndex for project:
 VERIFY_PROJ_FAIL = 'Unable to verify the global manifest repository entry for project: {}\n'
 
 # Git Command Error Messages
-GIT_CMD_ERROR = 'The git command: {} failed to complete succesfully with the following errors.\n'
+GIT_CMD_ERROR = 'The git command: {} failed to complete successfully with the following errors.\n'
-- 
2.16.2.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
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]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [edk2-staging/EdkRepo] [PATCH] EdkRepo: Correct typo in error strings
Posted by Pandya, Puja 4 years, 1 month ago 
Reviewed-by: Puja Pandya <puja.pandya@intel.com>


-----Original Message-----
From: Desimone, Ashley E <ashley.e.desimone@intel.com> 
Sent: Wednesday, March 4, 2020 5:49 PM
To: devel@edk2.groups.io
Cc: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Pandya, Puja <puja.pandya@intel.com>; Bjorge, Erik C <erik.c.bjorge@intel.com>
Subject: [edk2-staging/EdkRepo] [PATCH] EdkRepo: Correct typo in error strings

Fix typo of successfully

Signed-off-by: Ashley E Desimone <ashley.e.desimone@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Puja Pandya <puja.pandya@intel.com>
Cc: Erik Bjorge <erik.c.bjorge@intel.com>
---
 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/common_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_TEMPLATE_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 = UNSUPPORTED_COMBO + CHECKOUT_EXIT  CHECKOUT_CURRENT_COMBO = 'The selected combination, {0}, is already checked out ' + CHECKOUT_EXIT  CHECKOUT_UNCOMMITED_CHANGES = '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 = 'The specified remote branch for the {0} repo does not exist.'
-CHECKOUT_COMBO_UNSUCCESFULL = 'The combination {} was not able to be checked out succesfully. Returning to initially active combination.'
+CHECKOUT_COMBO_UNSUCCESSFULL = 'The combination {} was not able to be checked out successfully. Returning to initially active combination.'
 
 # Informational messages for checkout_command.py  CHECKING_OUT_COMBO = 'Checking out combination: {0} ...'
@@ -146,4 +146,4 @@ VERIFY_PROJ_NOT_IN_INDEX = 'Unable to find and entry in the CiIndex for project:
 VERIFY_PROJ_FAIL = 'Unable to verify the global manifest repository entry for project: {}\n'
 
 # Git Command Error Messages
-GIT_CMD_ERROR = 'The git command: {} failed to complete succesfully with the following errors.\n'
+GIT_CMD_ERROR = 'The git command: {} failed to complete successfully with the following errors.\n'
--
2.16.2.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#55558): https://edk2.groups.io/g/devel/message/55558
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]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [edk2-staging/EdkRepo] [PATCH] EdkRepo: Correct typo in error strings
Posted by Nate DeSimone 4 years, 1 month ago 
Reviewed-by: Nate DeSimone <nathaniel.l.desimone@intel.com>

-----Original Message-----
From: Desimone, Ashley E <ashley.e.desimone@intel.com> 
Sent: Wednesday, March 4, 2020 5:49 PM
To: devel@edk2.groups.io
Cc: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Pandya, Puja <puja.pandya@intel.com>; Bjorge, Erik C <erik.c.bjorge@intel.com>
Subject: [edk2-staging/EdkRepo] [PATCH] EdkRepo: Correct typo in error strings

Fix typo of successfully

Signed-off-by: Ashley E Desimone <ashley.e.desimone@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Puja Pandya <puja.pandya@intel.com>
Cc: Erik Bjorge <erik.c.bjorge@intel.com>
---
 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/common_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_TEMPLATE_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 = UNSUPPORTED_COMBO + CHECKOUT_EXIT  CHECKOUT_CURRENT_COMBO = 'The selected combination, {0}, is already checked out ' + CHECKOUT_EXIT  CHECKOUT_UNCOMMITED_CHANGES = '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 = 'The specified remote branch for the {0} repo does not exist.'
-CHECKOUT_COMBO_UNSUCCESFULL = 'The combination {} was not able to be checked out succesfully. Returning to initially active combination.'
+CHECKOUT_COMBO_UNSUCCESSFULL = 'The combination {} was not able to be checked out successfully. Returning to initially active combination.'
 
 # Informational messages for checkout_command.py  CHECKING_OUT_COMBO = 'Checking out combination: {0} ...'
@@ -146,4 +146,4 @@ VERIFY_PROJ_NOT_IN_INDEX = 'Unable to find and entry in the CiIndex for project:
 VERIFY_PROJ_FAIL = 'Unable to verify the global manifest repository entry for project: {}\n'
 
 # Git Command Error Messages
-GIT_CMD_ERROR = 'The git command: {} failed to complete succesfully with the following errors.\n'
+GIT_CMD_ERROR = 'The git command: {} failed to complete successfully with the following errors.\n'
--
2.16.2.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#55706): https://edk2.groups.io/g/devel/message/55706
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]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.