summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Delvare <jdelvare@suse.de>2014-12-18 17:06:06 +0100
committerJean Delvare <jdelvare@suse.de>2014-12-18 17:06:06 +0100
commitd56b11e711533b0adae8b0fd6b36ec01807d62b1 (patch)
treed2407fe89efe8df0eda7a69a2284bf5bc683022c
parent55c8292c99a1bc81b010b8b2422487039434c8c9 (diff)
downloadquilt-d56b11e711533b0adae8b0fd6b36ec01807d62b1.tar.gz
inspect-wrapper: Trace calls earlier
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.)
-rw-r--r--quilt/scripts/inspect-wrapper.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/quilt/scripts/inspect-wrapper.in b/quilt/scripts/inspect-wrapper.in
index 62eef87..c391037 100644
--- 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
;;