From 4091a37f1162bef94e66be970778f00d33a81b90816309325205bd4a4572ce9a Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 17 Aug 2011 19:50:04 +0000 Subject: [PATCH] Accepting request 79157 from home:dimstar:pytest special case to address python-gobject Requires OBS-URL: https://build.opensuse.org/request/show/79157 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gobject-introspection?expand=0&rev=66 --- gi-find-deps.sh | 4 ++-- gobject-introspection.changes | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/gi-find-deps.sh b/gi-find-deps.sh index 0939ba1..54299b9 100644 --- a/gi-find-deps.sh +++ b/gi-find-deps.sh @@ -20,7 +20,7 @@ fi } function print_req_prov { -echo -n "typelib($symbol)" +echo -n "$file: typelib($symbol)" if [ ! -z "$version" ]; then echo " = ${version}" else @@ -65,7 +65,7 @@ while read file; do done ;; *.py) - for module in $(grep -h -P "from gi.repository import (\w+)" $file | sed 's:#.*::' | sed -e 's,from gi.repository import,,' -r -e 's:\s+$::g' -e 's:\s+as\s+\w+::g' -e 's:,: :g'); do + for module in $(grep -h -P "from gi.repository import (\w+)" $file | sed -e 's:#.*::' -e 's:raise ImportError.*::' | sed -e 's,from gi.repository import,,' -r -e 's:\s+$::g' -e 's:\s+as\s+\w+::g' -e 's:,: :g'); do split_name_version $module print_req_prov done diff --git a/gobject-introspection.changes b/gobject-introspection.changes index 1ec303a..f204513 100644 --- a/gobject-introspection.changes +++ b/gobject-introspection.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Aug 17 19:47:13 UTC 2011 - dimstar@opensuse.org + +- Extend gi-find-deps.sh: Special case for .py files: + raise ImportError.* lines are deleted. pygobject for example + tries to explain how to convert the sources to the new gi-based + python bindings. + ------------------------------------------------------------------- Wed Jul 27 23:29:04 CEST 2011 - vuntz@opensuse.org