Accepting request 76485 from home:vuntz:branches:GNOME:Factory
Fix gi-find-deps to deal with \r\n OBS-URL: https://build.opensuse.org/request/show/76485 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gobject-introspection?expand=0&rev=62
This commit is contained in:
parent
c3d8d69b96
commit
d954ba886d
@ -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 -r -e 's,\s+$,,g' -e '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:,: :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+$::g' -e 's:\s+as\s+\w+::g' -e 's:,: :g'); do
|
||||
split_name_version $module
|
||||
print_req_prov
|
||||
done
|
||||
|
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 19 17:51:07 CEST 2011 - vuntz@opensuse.org
|
||||
|
||||
- gi-find-deps.sh: Remove trailing space characters from the
|
||||
import lines, when listing the required typelibs. This fixes an
|
||||
issue with files using \r\n to end a line (since \r was kept, and
|
||||
was breaking the output of the script).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 11 13:24:35 CEST 2011 - vuntz@opensuse.org
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user