ossp-pkg/svs/svs.sh 1.7 -> 1.8
--- svs.sh 2005/02/06 12:17:47 1.7
+++ svs.sh 2005/08/18 07:46:14 1.8
@@ -197,6 +197,10 @@
for file in "$@"; do
if [ -d $file ]; then
for f in `find $file -type f \( -name "*.orig" -or -name "*.rej" \) -print | sort`; do
+ base=`echo "$f" | sed -e 's;\.orig$;;' -e 's;\.rej$;;'`
+ if [ ".$f" = ".$base.orig" ] && [ -f $base.orig ] && [ -f $base.rej ]; then
+ continue
+ fi
files="$files $f"
done
elif [ -f $file ]; then
|
|
