[PATCH cygport] Fix handling of python{2,3} atoms in DEPEND

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH cygport] Fix handling of python{2,3} atoms in DEPEND

Jon TURNEY
python{2,3} atoms are not deparenthesized correctly, as that function
assumes the atom type consists of lowercase alphabetic characters only.

Probably also need to allow uppercase alphabetic characters as well, to
allow R atoms to work...

Signed-off-by: Jon Turney <[hidden email]>
---
 lib/check_funcs.cygpart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/check_funcs.cygpart b/lib/check_funcs.cygpart
index 961f263..1a0b41e 100644
--- a/lib/check_funcs.cygpart
+++ b/lib/check_funcs.cygpart
@@ -579,7 +579,7 @@ __check_depends() {
  return 0;
  fi
 
- __deparenthesize() { echo "$@" | sed -e 's|[a-z]*(\([^)]*\))|\1|' ; }
+ __deparenthesize() { echo "$@" | sed -e 's|[a-zA-Z0-9]*(\([^)]*\))|\1|' ; }
 
  for atom in ${DEPEND}
  do
--
2.17.0

Reply | Threaded
Open this post in threaded view
|

Re: [PATCH cygport] Fix handling of python{2,3} atoms in DEPEND

Yaakov Selkowitz
On 2018-05-13 13:40, Jon Turney wrote:

> python{2,3} atoms are not deparenthesized correctly, as that function
> assumes the atom type consists of lowercase alphabetic characters only.
>
> Probably also need to allow uppercase alphabetic characters as well, to
> allow R atoms to work...
>
> Signed-off-by: Jon Turney <[hidden email]>
> ---
>   lib/check_funcs.cygpart | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)

Merged.

--
Yaakov