diff options
author | Funda Wang <fwang@mageia.org> | 2013-01-20 14:47:06 +0000 |
---|---|---|
committer | Funda Wang <fwang@mageia.org> | 2013-01-20 14:47:06 +0000 |
commit | d020fc5cc685db3b8db9c9bd7caad2e75a06e3f4 (patch) | |
tree | 5e217a43c29b41928906772c172e3aab605dc8b9 | |
parent | d47b143a1bf832d4d429e39f3afd72484ca228bf (diff) | |
download | rpm-setup-d020fc5cc685db3b8db9c9bd7caad2e75a06e3f4.tar rpm-setup-d020fc5cc685db3b8db9c9bd7caad2e75a06e3f4.tar.gz rpm-setup-d020fc5cc685db3b8db9c9bd7caad2e75a06e3f4.tar.bz2 rpm-setup-d020fc5cc685db3b8db9c9bd7caad2e75a06e3f4.tar.xz rpm-setup-d020fc5cc685db3b8db9c9bd7caad2e75a06e3f4.zip |
fix bug#8757, gi-find-deps.sh incorrectly match 'imports.github'1.167
-rw-r--r-- | NEWS | 5 | ||||
-rwxr-xr-x | gi-find-deps.sh.in | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -1,4 +1,7 @@ -Version 1.166 - 10 Jan 2012, by Arnaud Patard +Version 1.167 - 20 Jan 2013, by Funda Wang +- fix bug#8757, gi-find-deps.sh incorrectly match 'imports.github' + +Version 1.166 - 10 Jan 2013, by Arnaud Patard - remove -fsigned-char on arm, as it should not be needed any more - fix dwz configuration on arm diff --git a/gi-find-deps.sh.in b/gi-find-deps.sh.in index e8a5785..a377d5f 100755 --- a/gi-find-deps.sh.in +++ b/gi-find-deps.sh.in @@ -59,13 +59,13 @@ function find_requires { while read file; do case $file in *.js) - for module in $(grep -h -P -o "imports.gi.([^\s'\";]+)" $file | grep -v "imports.gi.version" | sed 's,imports.gi.,,'); do + for module in $(grep -h -P -o "imports\.gi\.([^\s'\";]+)" $file | grep -v "imports\.gi\.version" | sed 's,imports.gi.,,'); do split_name_version $module print_req_prov 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:\s*,\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 echo "python-gi >= 2.90.2" |