[Buildroot] [PATCH 1/2] support/scripts/check-uniq-files: add indices in format string

[Buildroot] [PATCH 1/2] support/scripts/check-uniq-files: add indices in format string

[Thomas Petazzoni]

Using {} in format strings is only supported in sufficiently recent
Python versions. Python 2.6 doesn't support this, and only format
strings with numbered arguments: {0}, {1}, etc.

Python 2.7:

$ python -c 'print("foo {}".format(12))'
foo 12
$ python -c 'print("foo {0}".format(12))'
foo 12

Python 2.6:

$ python -c 'print("foo {}".format(12))'
Traceback (most recent call last):
  File "<string>", line 1, in <module>
ValueError: zero length field name in format
$ python -c 'print("foo {0}".format(12))'
foo 12

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 support/scripts/check-uniq-files | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/support/scripts/check-uniq-files b/support/scripts/check-uniq-files
index a3d176710e..be808cce03 100755
--- a/support/scripts/check-uniq-files
+++ b/support/scripts/check-uniq-files
@@ -5,7 +5,7 @@ import csv
 import argparse
 from collections import defaultdict
 
-warn = 'Warning: {} file "{}" is touched by more than one package: {}\n'
+warn = 'Warning: {0} file "{1}" is touched by more than one package: {2}\n'
 
 
 def main():
-- 
2.14.3

[Buildroot] [PATCH 2/2] support/dependencies/dependencies.sh: check for Python argparse module

[Thomas Petazzoni]

The script support/scripts/check-uniq-files uses the argparse Python
module. In most recent Python versions (starting with 2.7), the
argparse module is part of the standard library, and we already check
for the availability of Python in
support/dependencies/dependencies.sh.

However, when running on an ancient distribution with Python 2.6, the
argparse module is not part of the Python standard library, but
available as an external module. Without this module, the build fails,
because check-uniq-files, which is used in target-finalize, fails to
run.

To avoid this failure, this commit adds a check in
support/dependencies/dependencies.sh to verify that the argparse
module is available.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 support/dependencies/dependencies.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh
index 1804e85508..423fed8110 100755
--- a/support/dependencies/dependencies.sh
+++ b/support/dependencies/dependencies.sh
@@ -288,3 +288,8 @@ if [ -n "$missing_perl_modules" ] ; then
 	echo
 	exit 1
 fi
+
+if ! python -c "import argparse" > /dev/null 2>&1 ; then
+	echo "Your Python installation is not complete enough: argparse module is missing"
+	exit 1
+fi
-- 
2.14.3

[Buildroot] [PATCH 2/2] support/dependencies/dependencies.sh: check for Python argparse module

[Yann E. MORIN]

Thomas, All,

On 2018-03-03 15:36 +0100, Thomas Petazzoni spake thusly:
> The script support/scripts/check-uniq-files uses the argparse Python
> module. In most recent Python versions (starting with 2.7), the
> argparse module is part of the standard library, and we already check
> for the availability of Python in
> support/dependencies/dependencies.sh.
> 
> However, when running on an ancient distribution with Python 2.6, the
> argparse module is not part of the Python standard library, but
> available as an external module. Without this module, the build fails,
> because check-uniq-files, which is used in target-finalize, fails to
> run.
> 
> To avoid this failure, this commit adds a check in
> support/dependencies/dependencies.sh to verify that the argparse
> module is available.
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
>  support/dependencies/dependencies.sh | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh
> index 1804e85508..423fed8110 100755
> --- a/support/dependencies/dependencies.sh
> +++ b/support/dependencies/dependencies.sh
> @@ -288,3 +288,8 @@ if [ -n "$missing_perl_modules" ] ; then
>  	echo
>  	exit 1
>  fi
> +
> +if ! python -c "import argparse" > /dev/null 2>&1 ; then
> +	echo "Your Python installation is not complete enough: argparse module is missing"
> +	exit 1
> +fi
> -- 
> 2.14.3
> 

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

[Buildroot] [PATCH 2/2] support/dependencies/dependencies.sh: check for Python argparse module

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes:

 > The script support/scripts/check-uniq-files uses the argparse Python
 > module. In most recent Python versions (starting with 2.7), the
 > argparse module is part of the standard library, and we already check
 > for the availability of Python in
 > support/dependencies/dependencies.sh.

 > However, when running on an ancient distribution with Python 2.6, the
 > argparse module is not part of the Python standard library, but
 > available as an external module. Without this module, the build fails,
 > because check-uniq-files, which is used in target-finalize, fails to
 > run.

 > To avoid this failure, this commit adds a check in
 > support/dependencies/dependencies.sh to verify that the argparse
 > module is available.

 > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 1/2] support/scripts/check-uniq-files: add indices in format string

[Yann E. MORIN]

Thomas, All,

On 2018-03-03 15:36 +0100, Thomas Petazzoni spake thusly:
> Using {} in format strings is only supported in sufficiently recent
> Python versions. Python 2.6 doesn't support this, and only format
> strings with numbered arguments: {0}, {1}, etc.
> 
> Python 2.7:
> 
> $ python -c 'print("foo {}".format(12))'
> foo 12
> $ python -c 'print("foo {0}".format(12))'
> foo 12
> 
> Python 2.6:
> 
> $ python -c 'print("foo {}".format(12))'
> Traceback (most recent call last):
>   File "<string>", line 1, in <module>
> ValueError: zero length field name in format
> $ python -c 'print("foo {0}".format(12))'
> foo 12
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

https://docs.python.org/release/2.6/library/string.html#formatstrings

Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
>  support/scripts/check-uniq-files | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/support/scripts/check-uniq-files b/support/scripts/check-uniq-files
> index a3d176710e..be808cce03 100755
> --- a/support/scripts/check-uniq-files
> +++ b/support/scripts/check-uniq-files
> @@ -5,7 +5,7 @@ import csv
>  import argparse
>  from collections import defaultdict
>  
> -warn = 'Warning: {} file "{}" is touched by more than one package: {}\n'
> +warn = 'Warning: {0} file "{1}" is touched by more than one package: {2}\n'
>  
>  
>  def main():
> -- 
> 2.14.3
> 

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

[Buildroot] [PATCH 1/2] support/scripts/check-uniq-files: add indices in format string

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes:

 > Using {} in format strings is only supported in sufficiently recent
 > Python versions. Python 2.6 doesn't support this, and only format
 > strings with numbered arguments: {0}, {1}, etc.

 > Python 2.7:

 > $ python -c 'print("foo {}".format(12))'
 > foo 12
 > $ python -c 'print("foo {0}".format(12))'
 > foo 12

 > Python 2.6:

 > $ python -c 'print("foo {}".format(12))'
 > Traceback (most recent call last):
 >   File "<string>", line 1, in <module>
 > ValueError: zero length field name in format
 > $ python -c 'print("foo {0}".format(12))'
 > foo 12

 > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard