Skip to contentSkip to conversation

utils/check-package: add a check for the new spacing convention

PATCH Superseded Heiko Thiery 2 participants 3 messages Feb 5, 2020 – May 31, 2020

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 utils/check-package: add a check for the new spacing convention

The seperation of the fields in the hash file should be 2 spaces for consistency.

---
 utils/checkpackagelib/lib_hash.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
utils/checkpackagelib/lib_hash.py +6 -1
index 3e381119a5..87cc58a1bb 100644
@@ -40,7 +40,7 @@ class HashType(_CheckFunction):
         if len(fields) < 2:
             return
 
-        htype, hexa = fields[:2]
+        htype, hexa, filename = fields[:3]
         if htype == "none":
             return
         if htype not in self.len_of_hash.keys():
@@ -53,3 +53,8 @@ class HashType(_CheckFunction):
                     .format(self.filename, lineno, self.url_to_manual),
                     text,
                     "expected {} hex digits".format(self.len_of_hash[htype])]
+        if not re.match(re.escape("^{}  {}  {}.*$".format(
+                htype, hexa, filename)), text):
+            return ["{}:{}: separation does not match expectation "
+                    "({}#adding-packages-hash)"
+                    .format(self.filename, lineno, self.url_to_manual), text]
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 utils/check-package: add a check for the new spacing convention

Heiko, All,

On 2020-02-05 22:22 +0100, Heiko Thiery spake thusly:

Quoted 4 lines

The seperation of the fields in the hash file should be 2 spaces for consistency.

I was thinking about this one recently, but we still have too many issues with it:

    $ make check-package 2>&1 |grep warnings\ generated
    2166 warnings generated
    1692 warnings generated
    2538 warnings generated
    1551 warnings generated
    796 warnings generated

So, we need to either wiat for all the hash filers to be fixed one by one, or we need a mass conversion effort...

I did that conversion way back then, and it is trivial I think:

    $ find . -type f -name '*.hash' -print0 \
    |xargs -0 sed -r -i -e 's/^(md5|sha(1|224|256|384|512))[[:space:]]+([^[:space:]]+)[[:space:]]+(.+)$/\1  \3  \4/'
    $ git diff --stat
    [...]
     1793 files changed, 6298 insertions(+), 6298 deletions(-)

So I'm keeping your patch on the side for now...

Regards,
Yann E. MORIN.

Quoted 29 lines
---
 utils/checkpackagelib/lib_hash.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
utils/checkpackagelib/lib_hash.py +6 -1
index 3e381119a5..87cc58a1bb 100644
@@ -40,7 +40,7 @@ class HashType(_CheckFunction):
         if len(fields) < 2:
             return
 
-        htype, hexa = fields[:2]
+        htype, hexa, filename = fields[:3]
         if htype == "none":
             return
         if htype not in self.len_of_hash.keys():
@@ -53,3 +53,8 @@ class HashType(_CheckFunction):
                     .format(self.filename, lineno, self.url_to_manual),
                     text,
                     "expected {} hex digits".format(self.len_of_hash[htype])]
+        if not re.match(re.escape("^{}  {}  {}.*$".format(
+                htype, hexa, filename)), text):
+            return ["{}:{}: separation does not match expectation "
+                    "({}#adding-packages-hash)"
+                    .format(self.filename, lineno, self.url_to_manual), text]
Signature · 1 line
2.20.1
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#2 lore raw

PATCH 1/1 utils/check-package: add a check for the new spacing convention

Heiko, All,

On 2020-05-31 14:28 +0200, Yann E. MORIN spake thusly:

Quoted 8 lines

On 2020-02-05 22:22 +0100, Heiko Thiery spake thusly:

Quoted 4 lines

The seperation of the fields in the hash file should be 2 spaces for consistency.

I was thinking about this one recently, but we still have too many issues with it:

[--SNIP--]

Besides, it does not work for me:

    $ cat boot/afboot-stm32/afboot-stm32.hash
    # Locally calculated
    sha256  9b37b661bd3091ceb5d8dc5a56a2dfc02ae9ebc0c63dad3c4289c9d6b3d3ec89  afboot-stm32-0.2.tar.gz
    $ make check-package
    boot/afboot-stm32/afboot-stm32.hash:2: separation does not match expectation (http://nightly.buildroot.org/#adding-packages-hash)

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'