79c956ee44
inspect-check-if-wrapper-executable.patch: inspect: Report if patch/tar wrapper can't be executed (quilt setup). OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/quilt?expand=0&rev=47
71 lines
1.8 KiB
Diff
71 lines
1.8 KiB
Diff
inspect: Leave stderr free for actual error reporting.
|
|
---
|
|
quilt/scripts/inspect.in | 17 +++++++++--------
|
|
1 file changed, 9 insertions(+), 8 deletions(-)
|
|
|
|
--- quilt-0.50.orig/quilt/scripts/inspect.in
|
|
+++ quilt-0.50/quilt/scripts/inspect.in
|
|
@@ -76,11 +76,12 @@ then
|
|
fi
|
|
|
|
# Redirect file descriptors
|
|
+# 5 is used in verbose mode, 4 in non-verbose mode, and 2 for both (real errors)
|
|
if [ -n "$verbose" ]
|
|
then
|
|
- exec 3>&1 4>/dev/null
|
|
+ exec 3>&1 5>&2 4>/dev/null
|
|
else
|
|
- exec 3>&1 4>&2 2>/dev/null
|
|
+ exec 3>&1 4>&2 5>/dev/null
|
|
fi
|
|
|
|
# create md5 sums, also for uncompressed files
|
|
@@ -96,7 +97,7 @@ do
|
|
esac
|
|
[ -f "$file" ] || continue
|
|
echo -n "." >&4
|
|
- echo "md5sum < $file" >&2
|
|
+ echo "md5sum < $file" >&5
|
|
set -- $(md5sum < "$file")
|
|
echo "$1 $basename"
|
|
|
|
@@ -118,25 +119,25 @@ do
|
|
case "$filetype" in
|
|
compress*|gzip*)
|
|
echo -n "g" >&4
|
|
- echo "gzip -cd $file | md5sum" >&2
|
|
+ echo "gzip -cd $file | md5sum" >&5
|
|
set -- $(gzip -cd "$file" | md5sum)
|
|
echo "$1 $basename"
|
|
;;
|
|
bzip2*)
|
|
echo -n "b" >&4
|
|
- echo "bzip2 -cd $file | md5sum" >&2
|
|
+ echo "bzip2 -cd $file | md5sum" >&5
|
|
set -- $(bzip2 -cd "$file" | md5sum)
|
|
echo "$1 $basename"
|
|
;;
|
|
xz*|XZ*)
|
|
echo -n "x" >&4
|
|
- echo "xz -cd $file | md5sum" >&2
|
|
+ echo "xz -cd $file | md5sum" >&5
|
|
set -- $(xz -cd "$file" | md5sum)
|
|
echo "$1 $basename"
|
|
;;
|
|
lzma*)
|
|
echo -n "l" >&4
|
|
- echo "lzma -cd $file | md5sum" >&2
|
|
+ echo "lzma -cd $file | md5sum" >&5
|
|
set -- $(lzma -cd "$file" | md5sum)
|
|
echo "$1 $basename"
|
|
;;
|
|
@@ -339,7 +340,7 @@ rpmbuild --eval "%define _sourcedir $sou
|
|
--eval "%define __tar $tmpdir/bin/tar" \
|
|
--eval "$DEFINE_FUZZ" \
|
|
--nodeps \
|
|
- -bp "$specdir/$specfile" < /dev/null >&2
|
|
+ -bp "$specdir/$specfile" < /dev/null >&5 2>&5
|
|
status=$?
|
|
echo >&4
|
|
exit $status
|