sanity.bbclass: grammar/typo fixes re: Python install

Message ID 49c3457d-897a-cca5-ec91-c442be9ea18@crashcourse.ca
State New
Headers show
Series sanity.bbclass: grammar/typo fixes re: Python install | expand

Commit Message

Robert P. J. Day May 12, 2022, 8:45 a.m. UTC
Clean up various spelling/grammar oopsies in a small section of
sanity.bbclass.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>

---

Comments

Luca Ceresoli May 16, 2022, 7:32 a.m. UTC | #1
Hi Robert,

Il giorno Thu, 12 May 2022 04:45:57 -0400 (EDT)
"Robert P. J. Day" <rpjday@crashcourse.ca> ha scritto:

> Clean up various spelling/grammar oopsies in a small section of
> sanity.bbclass.
> 
> Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
> 
> ---
> 
> diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
> index b416918013..491a3bac6f 100644
> --- a/meta/classes/sanity.bbclass
> +++ b/meta/classes/sanity.bbclass
> @@ -631,11 +631,14 @@ def check_sanity_sstate_dir_change(sstate_dir,
> data): def check_sanity_version_change(status, d):
>      # Sanity checks to be done when SANITY_VERSION or
> NATIVELSBSTRING changes # In other words, these tests run once in a
> given build directory and then
> -    # never again until the sanity version or host distrubution
> id/version changes.
> +    # never again until the sanity version or host distribution
> id/version changes. +
> +    # Verify that the python install is complete. Examples that are
> often removed in
> +    # minimal installations:
> +    #
> +    #   glib-2.0-native requires xml.parsers.expat
> +    #   icu requires distutils.sysconfig
> 
> -    # Check the python install is complete. Examples that are often
> removed in
> -    # minimal installations: glib-2.0-natives requries #
> xml.parsers.expat and icu
> -    # requires distutils.sysconfig.
>      try:
>          import xml.parsers.expat
>          import distutils.sysconfig
> 

Your patch looks visually good, but it does not apply:

  error: patch failed: meta/classes/sanity.bbclass:631
  error: meta/classes/sanity.bbclass: patch does not apply
  error: Did you hand edit your patch?
  It does not apply to blobs recorded in its index.
  Patch failed at 0002 sanity.bbclass: grammar/typo fixes re: Python
  install

Can you please rebase and resend?

Weird enough, the patch you had sent a few minutes earlier applied
without problems.

Patch

diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index b416918013..491a3bac6f 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -631,11 +631,14 @@  def check_sanity_sstate_dir_change(sstate_dir, data):
 def check_sanity_version_change(status, d):
     # Sanity checks to be done when SANITY_VERSION or NATIVELSBSTRING changes
     # In other words, these tests run once in a given build directory and then
-    # never again until the sanity version or host distrubution id/version changes.
+    # never again until the sanity version or host distribution id/version changes.
+
+    # Verify that the python install is complete. Examples that are often removed in
+    # minimal installations:
+    #
+    #   glib-2.0-native requires xml.parsers.expat
+    #   icu requires distutils.sysconfig

-    # Check the python install is complete. Examples that are often removed in
-    # minimal installations: glib-2.0-natives requries # xml.parsers.expat and icu
-    # requires distutils.sysconfig.
     try:
         import xml.parsers.expat
         import distutils.sysconfig