This is the mail archive of the cygwin-apps@cygwin.com mailing list for the Cygwin project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [setup PATCH] Add some log msgs to installOneSource


On Wed, 2003-07-16 at 18:44, Max Bowsher wrote:
> 2003-07-16  Max Bowsher  <maxb@ukf.net>
> 
>         * install.cc (Installer::installOneSource): Add some log messages,
> as
>         a stopgap until we add some proper error handling here.
> 
> 
> Index: install.cc
> ===================================================================
> RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/install.cc,v
> retrieving revision 2.61
> diff -u -p -r2.61 install.cc
> --- install.cc 25 Mar 2003 20:57:13 -0000 2.61
> +++ install.cc 16 Jul 2003 08:21:39 -0000
> @@ -227,7 +227,14 @@ Installer::installOneSource (packagemeta
>        if (tmp2)
>   thefile = archive::extract (tmp2);
>        else
> - thefile = archive::extract (tmp);
> +        {
> +          log(LOG_PLAIN, String("Failed to decompress: ") +
> source.Cached() );
> +          thefile = archive::extract (tmp);

This isn't an error. It's simply the automagic compressed archive
detection.

> +        }
> +    }
> +  else
> +    {
> +      log(LOG_PLAIN, String("Failed to open: ") + source.Cached() );
>      }

this is redundant: the if (thefile) check covers this case, as thefile
is null on error.

> 
>    /* FIXME: potential leak of either *tmp or *tmp2 */
> @@ -339,6 +346,10 @@ Installer::installOneSource (packagemeta
>        delete thefile;
> 
>        total_bytes_sofar += package_bytes;
> +    }
> +  else
> +    {
> +      log(LOG_PLAIN, String("Failed to extract from archive: ") +
> source.Cached() );
>      }

This hunk is ok.

> 
>    progress (0);


Rob
-- 
GPG key available at: <http://members.aardvark.net.au/lifeless/keys.txt>.

Attachment: signature.asc
Description: This is a digitally signed message part


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]