Takashi Iwai
825d1e273d
- Fix the series file consistency checker - Many fixes and improvements to the setup command - New option --fast for quilt setup (hackweek project) OBS-URL: https://build.opensuse.org/request/show/264454 OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/quilt?expand=0&rev=92
54 lines
1.4 KiB
Diff
54 lines
1.4 KiB
Diff
From: Jean Delvare <jdelvare@suse.de>
|
|
Subject: inspect-wrapper: Trace calls earlier
|
|
Upstream: Submitted (2014-12-07)
|
|
|
|
Trace the calls to the patch/tar/unzip wrapper earlier. That way, if
|
|
anything goes wrong, we know which type of file was being processed.
|
|
Even if nothing goes wrong, the user now sees the file type as it is
|
|
being processed (which can take a long time.)
|
|
---
|
|
quilt/scripts/inspect-wrapper.in | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
--- a/quilt/scripts/inspect-wrapper.in
|
|
+++ b/quilt/scripts/inspect-wrapper.in
|
|
@@ -215,14 +215,17 @@ PATH=${PATH#*:}
|
|
tmpdir=${RPM_BUILD_DIR%/*}
|
|
case "${0##*/}" in
|
|
patch)
|
|
+ echo -n p >&4
|
|
inputfile=$(patch_input_file "$@")
|
|
;;
|
|
tar)
|
|
+ echo -n t >&4
|
|
inputfile=$(tar_input_file "$@")
|
|
# For tar, file - means read from stdin
|
|
[ "$inputfile" = "-" ] && inputfile=
|
|
;;
|
|
unzip)
|
|
+ echo -n Z >&4
|
|
inputfile=$(unzip_input_file "$@")
|
|
;;
|
|
esac
|
|
@@ -239,20 +242,17 @@ if [ -n "$unpackfile" ]
|
|
then
|
|
case "${0##*/}" in
|
|
patch)
|
|
- echo -n p >&4
|
|
subdir=$(patch_opt_d "$@")
|
|
dir=$(pwd_to_dir $subdir)
|
|
echo "${0##*/} ${dir:-.} $unpackfile" \
|
|
$(strip_option "$@") $(reverse_option "$@") >&3
|
|
;;
|
|
tar)
|
|
- echo -n t >&4
|
|
subdir=$(tar_opt_C "$@")
|
|
dir=$(pwd_to_dir $subdir)
|
|
echo "${0##*/} ${dir:-.} $unpackfile" >&3
|
|
;;
|
|
unzip)
|
|
- echo -n Z >&4
|
|
dir=$(pwd_to_dir)
|
|
echo "${0##*/} ${dir:-.} $unpackfile" >&3
|
|
;;
|