Hi,
Could I get a gold star for this change? It fixes a longstanding annoyance.
Also, one each for Jon and Andy for fixing other problems.
Thanks.
cgf
On Fri, Jul 30, 2010 at 08:19:20PM +0100, Dave Korn wrote:
>On 30/07/2010 15:37, Christopher Faylor wrote:
>
>> errors" page. The only two packages that should have been installed
>> were
>>
>> gcc: C compiler upgrade helper
>> glib: Gnome C function library (1.2 sources)
>>
>> (both of which are selected due to a setup.exe bug)
>
> I finally got bored of this one. Turned out to be trivially easy to fix
>once I looked at it, it's simply an early exit from the install routine when
>there's nothing to do for a dummy tarball (zero or 46-byte size) that misses
>out on marking the package as installed.
>
>setup/ChangeLog:
>
> * install.cc (Installer::installOne): Also record zero-sized
> tarballs as successfully installed.
>
> OK?
>
> cheers,
> DaveK
>
>Index: install.cc
>===================================================================
>RCS file: /cvs/cygwin-apps/setup/install.cc,v
>retrieving revision 2.95
>diff -p -u -r2.95 install.cc
>--- install.cc 7 Apr 2010 11:40:02 -0000 2.95
>+++ install.cc 30 Jul 2010 18:48:19 -0000
>@@ -301,7 +301,10 @@ Installer::installOne (packagemeta &pkgm
> error condition.
> Same goes for tar archives consisting of a big block of
> all zero bytes (the famous 46 bytes tar archives). */
>- ;
>+ {
>+ if (ver.Type () == package_binary)
>+ pkgm.installed = ver;
>+ }
> else
> {
> note (NULL, IDS_ERR_OPEN_READ, source.Cached (),
