public inbox for cygwin-apps@cygwin.com
 help / color / mirror / Atom feed
* [PATCH cygport] Fix handling of python{2,3} atoms in DEPEND
@ 2018-05-13 18:40 Jon Turney
  2018-06-07 20:59 ` Yaakov Selkowitz
  0 siblings, 1 reply; 2+ messages in thread
From: Jon Turney @ 2018-05-13 18:40 UTC (permalink / raw)
  To: cygwin-apps; +Cc: 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 <jon.turney@dronecode.org.uk>
---
 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

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH cygport] Fix handling of python{2,3} atoms in DEPEND
  2018-05-13 18:40 [PATCH cygport] Fix handling of python{2,3} atoms in DEPEND Jon Turney
@ 2018-06-07 20:59 ` Yaakov Selkowitz
  0 siblings, 0 replies; 2+ messages in thread
From: Yaakov Selkowitz @ 2018-06-07 20:59 UTC (permalink / raw)
  To: cygwin-apps

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 <jon.turney@dronecode.org.uk>
> ---
>   lib/check_funcs.cygpart | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)

Merged.

-- 
Yaakov

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-06-07 20:59 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-13 18:40 [PATCH cygport] Fix handling of python{2,3} atoms in DEPEND Jon Turney
2018-06-07 20:59 ` Yaakov Selkowitz

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).