[csw-maintainers] file-5.03

[Maciej (Matchek) Blizinski]

On Sun, Jan 17, 2010 at 8:30 PM, Dagobert Michelsen <dam at opencsw.org> wrote:
> Hi Maciej,
>
> Am 13.01.2010 um 11:37 schrieb Maciej (Matchek) Blizinski:
>>
>> We don't have our own, up-to-date file (or gfile), do we?
>
> There doesn't seem to be a "GNU File" command, but I have packaged
> the latest one from
>  http://www.darwinsys.com/file/
> which seems pretty good in testing:
>
> file-5.03,REV=2010.01.17-SunOS5.8-sparc-CSW.pkg.gz
> file-5.03,REV=2010.01.17-SunOS5.8-i386-CSW.pkg.gz

checkpkg doesn't work with it.

It exports two colons instead of one in the output, and checkpkg
doesn't detect a gzip file any more.

The fix:

Index: bin/checkpkg
===================================================================
--- bin/checkpkg        (revision 8048)
+++ bin/checkpkg        (working copy)
@@ -90,7 +90,9 @@

 set_variables_for_individual_package_check() {
        f=$1
-       file $f |sed 's/^.*://' |grep gzip >/dev/null
+       file $f \
+           | sed 's/^[^:]*://' \
+           | grep gzip >/dev/null
        if [ $? -eq 0 ] ; then
                TMPARCHIVE=$CHECKPKG_TMPDIR/`basename $f`
                if [[ -f $TMPARCHIVE ]] ; then

Committed in r8075.