cvs commit: src/lib/libarchive archive_write_disk.c src/lib/libarchive/test test_write_disk.c

Scott Long scottl at samsco.org
Tue Sep 18 12:47:54 PDT 2007


Kostik Belousov wrote:
> On Tue, Sep 18, 2007 at 04:20:21AM +0000, Tim Kientzle wrote:
>> kientzle    2007-09-18 04:20:21 UTC
>>
>>   FreeBSD src repository
>>
>>   Modified files:
>>     lib/libarchive       archive_write_disk.c 
>>     lib/libarchive/test  test_write_disk.c 
>>   Log:
>>   Correct the return value from archive_write_data()
>>   (when used to restore files to disk) to match:
>>     * The documentation
>>     * The return values of this function when used
>>       to write files into an archive.
>>   
>>   Approved by: re (bmah)
>>   Pointy hat: \me
>>   MFC after: 5 days
>>   
>>   Revision  Changes    Path
>>   1.15      +7 -4      src/lib/libarchive/archive_write_disk.c
>>   1.4       +26 -1     src/lib/libarchive/test/test_write_disk.c
> After this commit:
> 
> ===>  Patching for sdl_mixer-1.2.7_2
> ===>  Applying FreeBSD patches for sdl_mixer-1.2.7_2
> 1 out of 1 hunks failed--saving rejects to SDL_mixer.h.rej
> => Patch patch-SDL_mixer.h failed to apply cleanly.
> => Patch(es) patch-Makefile.in applied cleanly.
> *** Error code 1
> 
> Stop in /usr/ports/audio/sdl_mixer.
> *** Error code 1
> 
> It seems that tar is broken.

I think this patch needs to be backed out until further review is 
obtained.  This isn't a good time to leave things in a broken state for 
a week while we try to figure out the "right" thing to do.  Just back it
out to a known good state, then discuss and argue at your leisure.


Scott



More information about the cvs-src mailing list