aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristiaan Welvaart <cjw@mageia.org>2011-07-07 19:52:17 +0000
committerChristiaan Welvaart <cjw@mageia.org>2011-07-07 19:52:17 +0000
commit52572ab6938ee2c57edaff9b1efa1aa13ddd53ac (patch)
tree64818205a71d2af5599f7a91f2e9f51d88737310
parent2b0222bf310ddfd221e18d0bae46e803c04db1d2 (diff)
- gi deps for python: accept arbitrary whitespace in dependency lists1.138
-rw-r--r--NEWS3
-rw-r--r--configure.ac2
-rwxr-xr-xgi-find-deps.sh.in2
3 files changed, 5 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 0097ae4..c33fc89 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+Version 1.138 - 7 July 2011, by Christiaan Welvaart
+- gi deps for python: accept arbitrary whitespace in dependency lists
+
Version 1.137 - 7 July 2011, by Christiaan Welvaart
- extract gobject introspection typelib interdependencies using a helper program
diff --git a/configure.ac b/configure.ac
index c3aef0b..2929570 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
# $Id: configure.ac 271266 2010-11-04 10:43:28Z fwang $
AC_PREREQ(2.59)
-AC_INIT(rpm-mageia-setup, 1.137, boklm@mars-attacks.org)
+AC_INIT(rpm-mageia-setup, 1.138, boklm@mars-attacks.org)
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(1.9 -Wno-portability)
AC_CONFIG_SRCDIR
diff --git a/gi-find-deps.sh.in b/gi-find-deps.sh.in
index 0a356c2..69aecfd 100755
--- a/gi-find-deps.sh.in
+++ b/gi-find-deps.sh.in
@@ -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+as\s+\w+::g' -e 's:,::g'); do
+ 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+as\s+\w+::g' -e 's:\s*,\s*: :g'); do
split_name_version $module
print_req_prov
done