Skip to contentSkip to conversation

bitbake: replace 3 spaces with 4

PATCH In review Robert Yang 2 participants 3 messages Dec 27, 2013 – Jan 2, 2014

lore
Share & tools
lore
#0 lore raw

cover bitbake: replace 3 spaces with 4

The following changes since commit 005af45191ded6185c618c708181b31281e43092:

bitbake: fetch2: avoid printing "no checksum" error message twice (2013-12-22 14:29:13 +0000)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib robert/spaces
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/spaces

Robert Yang (1):
bitbake: replace 3 spaces with 4

 bitbake/lib/bb/fetch2/__init__.py |  8 ++++----
 bitbake/lib/ply/yacc.py           | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)
Signature · 1 line
1.8.3.1
#1 lore raw

PATCH 1/1 bitbake: replace 3 spaces with 4

A part of fetch2/__init__.py and yacc.py uses 3 spaces as the indent, I think that they should be typos.

---
 bitbake/lib/bb/fetch2/__init__.py |  8 ++++----
 bitbake/lib/ply/yacc.py           | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)
bitbake/lib/bb/fetch2/__init__.py +4 -4
index 8fdf59c..439a44a 100644
@@ -1263,10 +1263,10 @@ class FetchMethod(object):
         return
 
     def clean(self, urldata, d):
-       """
-       Clean any existing full or partial download
-       """
-       bb.utils.remove(urldata.localpath)
+        """
+        Clean any existing full or partial download
+        """
+        bb.utils.remove(urldata.localpath)
 
     def try_premirror(self, urldata, d):
         """
bitbake/lib/ply/yacc.py +6 -6
index 6168fd9..711987a 100644
@@ -2589,9 +2589,9 @@ _lr_signature = %r
                 f.write("""
 _lr_action = { }
 for _k, _v in _lr_action_items.items():
-   for _x,_y in zip(_v[0],_v[1]):
-      if not _x in _lr_action:  _lr_action[_x] = { }
-      _lr_action[_x][_k] = _y
+    for _x,_y in zip(_v[0],_v[1]):
+        if not _x in _lr_action:  _lr_action[_x] = { }
+        _lr_action[_x][_k] = _y
 del _lr_action_items
 """)
 
@@ -2629,9 +2629,9 @@ del _lr_action_items
                 f.write("""
 _lr_goto = { }
 for _k, _v in _lr_goto_items.items():
-   for _x,_y in zip(_v[0],_v[1]):
-       if not _x in _lr_goto: _lr_goto[_x] = { }
-       _lr_goto[_x][_k] = _y
+    for _x,_y in zip(_v[0],_v[1]):
+        if not _x in _lr_goto: _lr_goto[_x] = { }
+        _lr_goto[_x][_k] = _y
 del _lr_goto_items
 """)
             else:
Signature · 1 line
1.8.3.1
#2 lore raw
Quoted 18 lines · Robert Yang

A part of fetch2/__init__.py and yacc.py uses 3 spaces as the indent, I think that they should be typos.

---
 bitbake/lib/bb/fetch2/__init__.py |  8 ++++----
 bitbake/lib/ply/yacc.py           | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)
bitbake/lib/bb/fetch2/__init__.py +0 -1
index 8fdf59c..439a44a 100644
@@ -1263,10 +1263,10 @@ class FetchMethod(object):
         return
 
     def clean(self, urldata, d):
-       """

bitbake/lib/bb/fetch2/__init__.py class FetchMethod(object): · line 1272

Quoted 10 lines
bitbake/lib/bb/fetch2/__init__.py +4 -3
-       Clean any existing full or partial download
-       """
-       bb.utils.remove(urldata.localpath)
+        """
+        Clean any existing full or partial download
+        """
+        bb.utils.remove(urldata.localpath)
 
     def try_premirror(self, urldata, d):
         """

The __init__ change is fine and I've taken it, the yacc code is actually a copy from upstream so its better to leave that alone even if its not entirely correct.

Cheers,

Richard