Skip to contentSkip to conversation

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

PATCH In review Heiko Thiery 2 participants 2 messages Jun 3, 2020 – Jan 6, 2022

lore
Share & tools
lore
#0 lore raw

PATCH v3 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.

Cc Yann E. MORIN <[email protected]>
Cc Thomas Petazzoni <[email protected]>

---
v1 -> v2:
removed re.escape()

v2 -> v3:
re-add re.escape and removed '^' and '$' from regexp because they also are escaped by re.escape().

Now 'make check-package' will not throw any exceptions.

After conversion all hash files to the right format no more warnings will occure:

Oneliner provided by Yann will do that job:

  $ 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/'
---
 utils/checkpackagelib/lib_hash.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
utils/checkpackagelib/lib_hash.py +5 -1
index 3e381119a5..a72e8af0b9 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,7 @@ 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

Hello,

Le 03/06/2020 à 10:12, Heiko Thiery a écrit :

Quoted 2 lines

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

There are still a huge number of warnings when this patch is applied, because there are many packages still not fixed.

Best regards,
Romain

Quoted 39 lines
Cc Yann E. MORIN <[email protected]>
Cc Thomas Petazzoni <[email protected]>

---
v1 -> v2:
removed re.escape()

v2 -> v3:
re-add re.escape and removed '^' and '$' from regexp because they also are escaped by re.escape().

Now 'make check-package' will not throw any exceptions.

After conversion all hash files to the right format no more warnings will occure:

Oneliner provided by Yann will do that job:

  $ 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/'
---
 utils/checkpackagelib/lib_hash.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
utils/checkpackagelib/lib_hash.py +1 -1
index 3e381119a5..a72e8af0b9 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():

utils/checkpackagelib/lib_hash.py class HashType(_CheckFunction): · line 59

Quoted 7 lines
utils/checkpackagelib/lib_hash.py +4 -0
@@ -53,3 +53,7 @@ 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]

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot