diff mbox series

[RESEND,1/7] bitbake: utils: remove spaces on empty lines

Message ID 20231204155934.836992-2-jstephan@baylibre.com
State New
Headers show
Series Devtool/Recipetool: adding pypi support | expand

Commit Message

Julien Stephan Dec. 4, 2023, 3:59 p.m. UTC
Signed-off-by: Julien Stephan <jstephan@baylibre.com>
---
 bitbake/lib/bb/utils.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

Comments

Alexandre Belloni Dec. 5, 2023, 7:50 a.m. UTC | #1
Please do not send bitbake patches in the same series as oe-core patches
if there is no dependency. Those patches are applied on different
repositories.

On 04/12/2023 16:59:28+0100, Julien Stephan wrote:
> Signed-off-by: Julien Stephan <jstephan@baylibre.com>
> ---
>  bitbake/lib/bb/utils.py | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py
> index b401fa5ec7a..61ffad92ce3 100644
> --- a/bitbake/lib/bb/utils.py
> +++ b/bitbake/lib/bb/utils.py
> @@ -50,7 +50,7 @@ def clean_context():
>  
>  def get_context():
>      return _context
> -    
> +
>  
>  def set_context(ctx):
>      _context = ctx
> @@ -212,8 +212,8 @@ def explode_dep_versions2(s, *, sort=True):
>              inversion = True
>              # This list is based on behavior and supported comparisons from deb, opkg and rpm.
>              #
> -            # Even though =<, <<, ==, !=, =>, and >> may not be supported, 
> -            # we list each possibly valid item. 
> +            # Even though =<, <<, ==, !=, =>, and >> may not be supported,
> +            # we list each possibly valid item.
>              # The build system is responsible for validation of what it supports.
>              if i.startswith(('<=', '=<', '<<', '==', '!=', '>=', '=>', '>>')):
>                  lastcmp = i[0:2]
> @@ -347,7 +347,7 @@ def _print_exception(t, value, tb, realfile, text, context):
>          exception = traceback.format_exception_only(t, value)
>          error.append('Error executing a python function in %s:\n' % realfile)
>  
> -        # Strip 'us' from the stack (better_exec call) unless that was where the 
> +        # Strip 'us' from the stack (better_exec call) unless that was where the
>          # error came from
>          if tb.tb_next is not None:
>              tb = tb.tb_next
> @@ -746,9 +746,9 @@ def prunedir(topdir, ionice=False):
>  # but thats possibly insane and suffixes is probably going to be small
>  #
>  def prune_suffix(var, suffixes, d):
> -    """ 
> +    """
>      See if var ends with any of the suffixes listed and
> -    remove it if found 
> +    remove it if found
>      """
>      for suffix in suffixes:
>          if suffix and var.endswith(suffix):
> @@ -1001,9 +1001,9 @@ def umask(new_mask):
>          os.umask(current_mask)
>  
>  def to_boolean(string, default=None):
> -    """ 
> +    """
>      Check input string and return boolean value True/False/None
> -    depending upon the checks 
> +    depending upon the checks
>      """
>      if not string:
>          return default
> -- 
> 2.42.0
> 

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#191754): https://lists.openembedded.org/g/openembedded-core/message/191754
> Mute This Topic: https://lists.openembedded.org/mt/102972946/3617179
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Julien Stephan Dec. 5, 2023, 2:57 p.m. UTC | #2
Le mar. 5 déc. 2023 à 08:50, Alexandre Belloni
<alexandre.belloni@bootlin.com> a écrit :
>
> Please do not send bitbake patches in the same series as oe-core patches
> if there is no dependency. Those patches are applied on different
> repositories.

Hi Alexandre,

Noted! Do you want me to resend the series without the bitbake patch?

Cheers
Julien
>
> On 04/12/2023 16:59:28+0100, Julien Stephan wrote:
> > Signed-off-by: Julien Stephan <jstephan@baylibre.com>
> > ---
> >  bitbake/lib/bb/utils.py | 16 ++++++++--------
> >  1 file changed, 8 insertions(+), 8 deletions(-)
> >
> > diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py
> > index b401fa5ec7a..61ffad92ce3 100644
> > --- a/bitbake/lib/bb/utils.py
> > +++ b/bitbake/lib/bb/utils.py
> > @@ -50,7 +50,7 @@ def clean_context():
> >
> >  def get_context():
> >      return _context
> > -
> > +
> >
> >  def set_context(ctx):
> >      _context = ctx
> > @@ -212,8 +212,8 @@ def explode_dep_versions2(s, *, sort=True):
> >              inversion = True
> >              # This list is based on behavior and supported comparisons from deb, opkg and rpm.
> >              #
> > -            # Even though =<, <<, ==, !=, =>, and >> may not be supported,
> > -            # we list each possibly valid item.
> > +            # Even though =<, <<, ==, !=, =>, and >> may not be supported,
> > +            # we list each possibly valid item.
> >              # The build system is responsible for validation of what it supports.
> >              if i.startswith(('<=', '=<', '<<', '==', '!=', '>=', '=>', '>>')):
> >                  lastcmp = i[0:2]
> > @@ -347,7 +347,7 @@ def _print_exception(t, value, tb, realfile, text, context):
> >          exception = traceback.format_exception_only(t, value)
> >          error.append('Error executing a python function in %s:\n' % realfile)
> >
> > -        # Strip 'us' from the stack (better_exec call) unless that was where the
> > +        # Strip 'us' from the stack (better_exec call) unless that was where the
> >          # error came from
> >          if tb.tb_next is not None:
> >              tb = tb.tb_next
> > @@ -746,9 +746,9 @@ def prunedir(topdir, ionice=False):
> >  # but thats possibly insane and suffixes is probably going to be small
> >  #
> >  def prune_suffix(var, suffixes, d):
> > -    """
> > +    """
> >      See if var ends with any of the suffixes listed and
> > -    remove it if found
> > +    remove it if found
> >      """
> >      for suffix in suffixes:
> >          if suffix and var.endswith(suffix):
> > @@ -1001,9 +1001,9 @@ def umask(new_mask):
> >          os.umask(current_mask)
> >
> >  def to_boolean(string, default=None):
> > -    """
> > +    """
> >      Check input string and return boolean value True/False/None
> > -    depending upon the checks
> > +    depending upon the checks
> >      """
> >      if not string:
> >          return default
> > --
> > 2.42.0
> >
>
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#191754): https://lists.openembedded.org/g/openembedded-core/message/191754
> > Mute This Topic: https://lists.openembedded.org/mt/102972946/3617179
> > Group Owner: openembedded-core+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
>
>
> --
> Alexandre Belloni, co-owner and COO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
Alexandre Belloni Dec. 5, 2023, 3:45 p.m. UTC | #3
On 05/12/2023 15:57:58+0100, Julien Stephan wrote:
> Le mar. 5 d�c. 2023 � 08:50, Alexandre Belloni
> <alexandre.belloni@bootlin.com> a �crit :
> >
> > Please do not send bitbake patches in the same series as oe-core patches
> > if there is no dependency. Those patches are applied on different
> > repositories.
> 
> Hi Alexandre,
> 
> Noted! Do you want me to resend the series without the bitbake patch?

No but  didn't take the bitbake patch because it doesn't do what the
commit message says. (i.e. it touches non empty lines)

> 
> Cheers
> Julien
> >
> > On 04/12/2023 16:59:28+0100, Julien Stephan wrote:
> > > Signed-off-by: Julien Stephan <jstephan@baylibre.com>
> > > ---
> > >  bitbake/lib/bb/utils.py | 16 ++++++++--------
> > >  1 file changed, 8 insertions(+), 8 deletions(-)
> > >
> > > diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py
> > > index b401fa5ec7a..61ffad92ce3 100644
> > > --- a/bitbake/lib/bb/utils.py
> > > +++ b/bitbake/lib/bb/utils.py
> > > @@ -50,7 +50,7 @@ def clean_context():
> > >
> > >  def get_context():
> > >      return _context
> > > -
> > > +
> > >
> > >  def set_context(ctx):
> > >      _context = ctx
> > > @@ -212,8 +212,8 @@ def explode_dep_versions2(s, *, sort=True):
> > >              inversion = True
> > >              # This list is based on behavior and supported comparisons from deb, opkg and rpm.
> > >              #
> > > -            # Even though =<, <<, ==, !=, =>, and >> may not be supported,
> > > -            # we list each possibly valid item.
> > > +            # Even though =<, <<, ==, !=, =>, and >> may not be supported,
> > > +            # we list each possibly valid item.
> > >              # The build system is responsible for validation of what it supports.
> > >              if i.startswith(('<=', '=<', '<<', '==', '!=', '>=', '=>', '>>')):
> > >                  lastcmp = i[0:2]
> > > @@ -347,7 +347,7 @@ def _print_exception(t, value, tb, realfile, text, context):
> > >          exception = traceback.format_exception_only(t, value)
> > >          error.append('Error executing a python function in %s:\n' % realfile)
> > >
> > > -        # Strip 'us' from the stack (better_exec call) unless that was where the
> > > +        # Strip 'us' from the stack (better_exec call) unless that was where the
> > >          # error came from
> > >          if tb.tb_next is not None:
> > >              tb = tb.tb_next
> > > @@ -746,9 +746,9 @@ def prunedir(topdir, ionice=False):
> > >  # but thats possibly insane and suffixes is probably going to be small
> > >  #
> > >  def prune_suffix(var, suffixes, d):
> > > -    """
> > > +    """
> > >      See if var ends with any of the suffixes listed and
> > > -    remove it if found
> > > +    remove it if found
> > >      """
> > >      for suffix in suffixes:
> > >          if suffix and var.endswith(suffix):
> > > @@ -1001,9 +1001,9 @@ def umask(new_mask):
> > >          os.umask(current_mask)
> > >
> > >  def to_boolean(string, default=None):
> > > -    """
> > > +    """
> > >      Check input string and return boolean value True/False/None
> > > -    depending upon the checks
> > > +    depending upon the checks
> > >      """
> > >      if not string:
> > >          return default
> > > --
> > > 2.42.0
> > >
> >
> > >
> > > -=-=-=-=-=-=-=-=-=-=-=-
> > > Links: You receive all messages sent to this group.
> > > View/Reply Online (#191754): https://lists.openembedded.org/g/openembedded-core/message/191754
> > > Mute This Topic: https://lists.openembedded.org/mt/102972946/3617179
> > > Group Owner: openembedded-core+owner@lists.openembedded.org
> > > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> > > -=-=-=-=-=-=-=-=-=-=-=-
> > >
> >
> >
> > --
> > Alexandre Belloni, co-owner and COO, Bootlin
> > Embedded Linux and Kernel engineering
> > https://bootlin.com
Julien Stephan Dec. 5, 2023, 4:27 p.m. UTC | #4
Le mar. 5 déc. 2023 à 16:45, Alexandre Belloni
<alexandre.belloni@bootlin.com> a écrit :
>
> On 05/12/2023 15:57:58+0100, Julien Stephan wrote:
> > Le mar. 5 déc. 2023 à 08:50, Alexandre Belloni
> > <alexandre.belloni@bootlin.com> a écrit :
> > >
> > > Please do not send bitbake patches in the same series as oe-core patches
> > > if there is no dependency. Those patches are applied on different
> > > repositories.
> >
> > Hi Alexandre,
> >
> > Noted! Do you want me to resend the series without the bitbake patch?
>
> No but  didn't take the bitbake patch because it doesn't do what the
> commit message says. (i.e. it touches non empty lines)
>

oups, I will update the commit message and send it to the appropriate list.

> >
> > Cheers
> > Julien
> > >
> > > On 04/12/2023 16:59:28+0100, Julien Stephan wrote:
> > > > Signed-off-by: Julien Stephan <jstephan@baylibre.com>
> > > > ---
> > > >  bitbake/lib/bb/utils.py | 16 ++++++++--------
> > > >  1 file changed, 8 insertions(+), 8 deletions(-)
> > > >
> > > > diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py
> > > > index b401fa5ec7a..61ffad92ce3 100644
> > > > --- a/bitbake/lib/bb/utils.py
> > > > +++ b/bitbake/lib/bb/utils.py
> > > > @@ -50,7 +50,7 @@ def clean_context():
> > > >
> > > >  def get_context():
> > > >      return _context
> > > > -
> > > > +
> > > >
> > > >  def set_context(ctx):
> > > >      _context = ctx
> > > > @@ -212,8 +212,8 @@ def explode_dep_versions2(s, *, sort=True):
> > > >              inversion = True
> > > >              # This list is based on behavior and supported comparisons from deb, opkg and rpm.
> > > >              #
> > > > -            # Even though =<, <<, ==, !=, =>, and >> may not be supported,
> > > > -            # we list each possibly valid item.
> > > > +            # Even though =<, <<, ==, !=, =>, and >> may not be supported,
> > > > +            # we list each possibly valid item.
> > > >              # The build system is responsible for validation of what it supports.
> > > >              if i.startswith(('<=', '=<', '<<', '==', '!=', '>=', '=>', '>>')):
> > > >                  lastcmp = i[0:2]
> > > > @@ -347,7 +347,7 @@ def _print_exception(t, value, tb, realfile, text, context):
> > > >          exception = traceback.format_exception_only(t, value)
> > > >          error.append('Error executing a python function in %s:\n' % realfile)
> > > >
> > > > -        # Strip 'us' from the stack (better_exec call) unless that was where the
> > > > +        # Strip 'us' from the stack (better_exec call) unless that was where the
> > > >          # error came from
> > > >          if tb.tb_next is not None:
> > > >              tb = tb.tb_next
> > > > @@ -746,9 +746,9 @@ def prunedir(topdir, ionice=False):
> > > >  # but thats possibly insane and suffixes is probably going to be small
> > > >  #
> > > >  def prune_suffix(var, suffixes, d):
> > > > -    """
> > > > +    """
> > > >      See if var ends with any of the suffixes listed and
> > > > -    remove it if found
> > > > +    remove it if found
> > > >      """
> > > >      for suffix in suffixes:
> > > >          if suffix and var.endswith(suffix):
> > > > @@ -1001,9 +1001,9 @@ def umask(new_mask):
> > > >          os.umask(current_mask)
> > > >
> > > >  def to_boolean(string, default=None):
> > > > -    """
> > > > +    """
> > > >      Check input string and return boolean value True/False/None
> > > > -    depending upon the checks
> > > > +    depending upon the checks
> > > >      """
> > > >      if not string:
> > > >          return default
> > > > --
> > > > 2.42.0
> > > >
> > >
> > > >
> > > > -=-=-=-=-=-=-=-=-=-=-=-
> > > > Links: You receive all messages sent to this group.
> > > > View/Reply Online (#191754): https://lists.openembedded.org/g/openembedded-core/message/191754
> > > > Mute This Topic: https://lists.openembedded.org/mt/102972946/3617179
> > > > Group Owner: openembedded-core+owner@lists.openembedded.org
> > > > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> > > > -=-=-=-=-=-=-=-=-=-=-=-
> > > >
> > >
> > >
> > > --
> > > Alexandre Belloni, co-owner and COO, Bootlin
> > > Embedded Linux and Kernel engineering
> > > https://bootlin.com
>
> --
> Alexandre Belloni, co-owner and COO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
Julien Stephan Dec. 6, 2023, 8:24 a.m. UTC | #5
Le mar. 5 déc. 2023 à 17:27, Julien Stephan via lists.openembedded.org
<jstephan=baylibre.com@lists.openembedded.org> a écrit :
>
> Le mar. 5 déc. 2023 à 16:45, Alexandre Belloni
> <alexandre.belloni@bootlin.com> a écrit :
> >
> > On 05/12/2023 15:57:58+0100, Julien Stephan wrote:
> > > Le mar. 5 déc. 2023 à 08:50, Alexandre Belloni
> > > <alexandre.belloni@bootlin.com> a écrit :
> > > >
> > > > Please do not send bitbake patches in the same series as oe-core patches
> > > > if there is no dependency. Those patches are applied on different
> > > > repositories.
> > >
> > > Hi Alexandre,
> > >
> > > Noted! Do you want me to resend the series without the bitbake patch?
> >
> > No but  didn't take the bitbake patch because it doesn't do what the
> > commit message says. (i.e. it touches non empty lines)
> >
>
> oups, I will update the commit message and send it to the appropriate list.
>

It has already been merged with the incorrect commit message :( sorry for that

Cheers
Julien
> > >
> > > Cheers
> > > Julien
> > > >
> > > > On 04/12/2023 16:59:28+0100, Julien Stephan wrote:
> > > > > Signed-off-by: Julien Stephan <jstephan@baylibre.com>
> > > > > ---
> > > > >  bitbake/lib/bb/utils.py | 16 ++++++++--------
> > > > >  1 file changed, 8 insertions(+), 8 deletions(-)
> > > > >
> > > > > diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py
> > > > > index b401fa5ec7a..61ffad92ce3 100644
> > > > > --- a/bitbake/lib/bb/utils.py
> > > > > +++ b/bitbake/lib/bb/utils.py
> > > > > @@ -50,7 +50,7 @@ def clean_context():
> > > > >
> > > > >  def get_context():
> > > > >      return _context
> > > > > -
> > > > > +
> > > > >
> > > > >  def set_context(ctx):
> > > > >      _context = ctx
> > > > > @@ -212,8 +212,8 @@ def explode_dep_versions2(s, *, sort=True):
> > > > >              inversion = True
> > > > >              # This list is based on behavior and supported comparisons from deb, opkg and rpm.
> > > > >              #
> > > > > -            # Even though =<, <<, ==, !=, =>, and >> may not be supported,
> > > > > -            # we list each possibly valid item.
> > > > > +            # Even though =<, <<, ==, !=, =>, and >> may not be supported,
> > > > > +            # we list each possibly valid item.
> > > > >              # The build system is responsible for validation of what it supports.
> > > > >              if i.startswith(('<=', '=<', '<<', '==', '!=', '>=', '=>', '>>')):
> > > > >                  lastcmp = i[0:2]
> > > > > @@ -347,7 +347,7 @@ def _print_exception(t, value, tb, realfile, text, context):
> > > > >          exception = traceback.format_exception_only(t, value)
> > > > >          error.append('Error executing a python function in %s:\n' % realfile)
> > > > >
> > > > > -        # Strip 'us' from the stack (better_exec call) unless that was where the
> > > > > +        # Strip 'us' from the stack (better_exec call) unless that was where the
> > > > >          # error came from
> > > > >          if tb.tb_next is not None:
> > > > >              tb = tb.tb_next
> > > > > @@ -746,9 +746,9 @@ def prunedir(topdir, ionice=False):
> > > > >  # but thats possibly insane and suffixes is probably going to be small
> > > > >  #
> > > > >  def prune_suffix(var, suffixes, d):
> > > > > -    """
> > > > > +    """
> > > > >      See if var ends with any of the suffixes listed and
> > > > > -    remove it if found
> > > > > +    remove it if found
> > > > >      """
> > > > >      for suffix in suffixes:
> > > > >          if suffix and var.endswith(suffix):
> > > > > @@ -1001,9 +1001,9 @@ def umask(new_mask):
> > > > >          os.umask(current_mask)
> > > > >
> > > > >  def to_boolean(string, default=None):
> > > > > -    """
> > > > > +    """
> > > > >      Check input string and return boolean value True/False/None
> > > > > -    depending upon the checks
> > > > > +    depending upon the checks
> > > > >      """
> > > > >      if not string:
> > > > >          return default
> > > > > --
> > > > > 2.42.0
> > > > >
> > > >
> > > > >
> > > > >
> > > > >
> > > >
> > > >
> > > > --
> > > > Alexandre Belloni, co-owner and COO, Bootlin
> > > > Embedded Linux and Kernel engineering
> > > > https://bootlin.com
> >
> > --
> > Alexandre Belloni, co-owner and COO, Bootlin
> > Embedded Linux and Kernel engineering
> > https://bootlin.com
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#191847): https://lists.openembedded.org/g/openembedded-core/message/191847
> Mute This Topic: https://lists.openembedded.org/mt/102972946/4356723
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [jstephan@baylibre.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py
index b401fa5ec7a..61ffad92ce3 100644
--- a/bitbake/lib/bb/utils.py
+++ b/bitbake/lib/bb/utils.py
@@ -50,7 +50,7 @@  def clean_context():
 
 def get_context():
     return _context
-    
+
 
 def set_context(ctx):
     _context = ctx
@@ -212,8 +212,8 @@  def explode_dep_versions2(s, *, sort=True):
             inversion = True
             # This list is based on behavior and supported comparisons from deb, opkg and rpm.
             #
-            # Even though =<, <<, ==, !=, =>, and >> may not be supported, 
-            # we list each possibly valid item. 
+            # Even though =<, <<, ==, !=, =>, and >> may not be supported,
+            # we list each possibly valid item.
             # The build system is responsible for validation of what it supports.
             if i.startswith(('<=', '=<', '<<', '==', '!=', '>=', '=>', '>>')):
                 lastcmp = i[0:2]
@@ -347,7 +347,7 @@  def _print_exception(t, value, tb, realfile, text, context):
         exception = traceback.format_exception_only(t, value)
         error.append('Error executing a python function in %s:\n' % realfile)
 
-        # Strip 'us' from the stack (better_exec call) unless that was where the 
+        # Strip 'us' from the stack (better_exec call) unless that was where the
         # error came from
         if tb.tb_next is not None:
             tb = tb.tb_next
@@ -746,9 +746,9 @@  def prunedir(topdir, ionice=False):
 # but thats possibly insane and suffixes is probably going to be small
 #
 def prune_suffix(var, suffixes, d):
-    """ 
+    """
     See if var ends with any of the suffixes listed and
-    remove it if found 
+    remove it if found
     """
     for suffix in suffixes:
         if suffix and var.endswith(suffix):
@@ -1001,9 +1001,9 @@  def umask(new_mask):
         os.umask(current_mask)
 
 def to_boolean(string, default=None):
-    """ 
+    """
     Check input string and return boolean value True/False/None
-    depending upon the checks 
+    depending upon the checks
     """
     if not string:
         return default