From 1b818782000b677620c3b9920d2ab0a25c1232842cfc7ac9799bb506fb7d6b5b Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 16 Aug 2013 10:48:57 +0000 Subject: [PATCH] Accepting request 195421 from home:dimstar:branches:GNOME:Factory - Enhance gi-find-deps.sh: when scannig python file for gi.require_version, make sure to ignore python comments (starting with #). OBS-URL: https://build.opensuse.org/request/show/195421 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gobject-introspection?expand=0&rev=127 --- gi-find-deps.sh | 2 +- gobject-introspection.changes | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gi-find-deps.sh b/gi-find-deps.sh index 8d06e96..e798a3c 100644 --- a/gi-find-deps.sh +++ b/gi-find-deps.sh @@ -51,7 +51,7 @@ function python_requires { # Temporarly disabled... this is not true if the python code is written for python3... And there seems no real 'way' to identify this. # echo "python-gobject >= 2.21.4" done - for module in $(grep -h -P -o "(gi\.require_version\(['\"][^'\"]+['\"],\s*['\"][^'\"]+['\"]\))" $1 | sed -e 's:gi.require_version::' -e "s:[()\"' ]::g" -e 's:,:-:'); do + for module in $(grep -h -P -o ".*(gi\.require_version\(['\"][^'\"]+['\"],\s*['\"][^'\"]+['\"]\))" $1 | sed -e 's:#.*::' -e 's:.*gi.require_version::' -e "s:[()\"' ]::g" -e 's:,:-:'); do split_name_version $module print_req_prov done diff --git a/gobject-introspection.changes b/gobject-introspection.changes index f3fc16f..57a42f3 100644 --- a/gobject-introspection.changes +++ b/gobject-introspection.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Aug 16 08:44:06 UTC 2013 - dimstar@opensuse.org + +- Enhance gi-find-deps.sh: when scannig python file for + gi.require_version, make sure to ignore python comments (starting + with #). + ------------------------------------------------------------------- Thu Aug 15 06:56:37 UTC 2013 - dimstar@opensuse.org