Fix check_unpackaged. We didn't really need that CMP since all the work was
being done with cat | sort | uniq -u anyway.
This commit is contained in:
parent
e13ebe8b9f
commit
b9c7b5c0ee
@ -373,19 +373,17 @@ check_unpackaged()
|
|||||||
$FIND . -type d -print|$SED -e 's/\.\///g'|$GREP -v '^\.' >> $tmpdir/files.tmp
|
$FIND . -type d -print|$SED -e 's/\.\///g'|$GREP -v '^\.' >> $tmpdir/files.tmp
|
||||||
$SORT $metadir/files.tmp|$UNIQ > $tmpdir/f1
|
$SORT $metadir/files.tmp|$UNIQ > $tmpdir/f1
|
||||||
$SORT $tmpdir/files.tmp > $tmpdir/f2
|
$SORT $tmpdir/files.tmp > $tmpdir/f2
|
||||||
if [ ! "$($CMP $tmpdir/f1 $tmpdir/f2)" == "" ]; then
|
upf="$($CAT $tmpdir/f1 $tmpdir/f2 | $SORT | $UNIQ -u)"
|
||||||
upf="$($CAT $tmpdir/f1 $tmpdir/f2 | $SORT | $UNIQ -u)"
|
if [ ! -z "$upf" ]; then
|
||||||
if [ ! -z "$upf" ]; then
|
echo "There are unpackaged files in the stagedir:"
|
||||||
echo "There are unpackaged files in the stagedir:"
|
for i in $upf
|
||||||
for i in $upf
|
do
|
||||||
do
|
echo "${indent4}${i}"
|
||||||
echo "${indent4}${i}"
|
done
|
||||||
done
|
$RM -f $tmpdir/f1 $tmpdir/f2
|
||||||
fi
|
if [ "$ignore_unpackaged_files" -eq 0 ]; then
|
||||||
$RM -f $tmpdir/f1 $tmpdir/f2
|
error $E_UNPACKAGED_FILES check_unpackaged
|
||||||
if [ "$ignore_unpackaged_files" -eq 0 ]; then
|
fi
|
||||||
error $E_UNPACKAGED_FILES check_unpackaged
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
$RM -f $tmpdir/f1 $tmpdir/f2
|
$RM -f $tmpdir/f1 $tmpdir/f2
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user