From b9c7b5c0eeb544312feaf458b088f2bf18a6e74e Mon Sep 17 00:00:00 2001
From: "Tom G. Christensen" <tgc@jupiterrise.com>
Date: Wed, 21 Jul 2004 20:18:15 +0000
Subject: [PATCH] Fix check_unpackaged. We didn't really need that CMP since
 all the work was being done with cat | sort | uniq -u anyway.

---
 buildpkg.packaging.solaris | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/buildpkg.packaging.solaris b/buildpkg.packaging.solaris
index 48fef47..457ae81 100644
--- a/buildpkg.packaging.solaris
+++ b/buildpkg.packaging.solaris
@@ -373,19 +373,17 @@ check_unpackaged()
     $FIND . -type d -print|$SED -e 's/\.\///g'|$GREP -v '^\.' >> $tmpdir/files.tmp
     $SORT $metadir/files.tmp|$UNIQ > $tmpdir/f1
     $SORT $tmpdir/files.tmp > $tmpdir/f2
-    if [ ! "$($CMP $tmpdir/f1 $tmpdir/f2)" == "" ]; then
-	upf="$($CAT $tmpdir/f1 $tmpdir/f2 | $SORT | $UNIQ -u)"
-        if [ ! -z "$upf" ]; then
-            echo "There are unpackaged files in the stagedir:"
-            for i in $upf
-            do
-                echo "${indent4}${i}"
-            done
-        fi
-        $RM -f $tmpdir/f1 $tmpdir/f2
-        if [ "$ignore_unpackaged_files" -eq 0 ]; then
-            error $E_UNPACKAGED_FILES check_unpackaged
-        fi
+    upf="$($CAT $tmpdir/f1 $tmpdir/f2 | $SORT | $UNIQ -u)"
+    if [ ! -z "$upf" ]; then
+	echo "There are unpackaged files in the stagedir:"
+	for i in $upf
+	do
+	    echo "${indent4}${i}"
+	done
+	$RM -f $tmpdir/f1 $tmpdir/f2
+	if [ "$ignore_unpackaged_files" -eq 0 ]; then
+	    error $E_UNPACKAGED_FILES check_unpackaged
+	fi
     fi
     $RM -f $tmpdir/f1 $tmpdir/f2
 }