# HG changeset patch # User jlarmour # Date 1035429414 0 # Node ID 44d2cbd109ee21bf0558e5cb5a95bddf01254c4e # Parent 9eabe1bbbd21ee053da5dbb030943a56c166f5e7 * ecosadmin.tcl (ecosadmin::process_add_package): Use gzip -d, not gunzip, as the latter fails with TCL on cygwin. diff --git a/packages/ChangeLog b/packages/ChangeLog --- a/packages/ChangeLog +++ b/packages/ChangeLog @@ -1,3 +1,8 @@ +2002-10-24 Jonathan Larmour + + * ecosadmin.tcl (ecosadmin::process_add_package): Use gzip -d, not + gunzip, as the latter fails with TCL on cygwin. + 2002-10-18 Gary Thomas * ecos.db: Change package name for TS1000 flash part (consistency). diff --git a/packages/ecosadmin.tcl b/packages/ecosadmin.tcl --- a/packages/ecosadmin.tcl +++ b/packages/ecosadmin.tcl @@ -1073,7 +1073,7 @@ proc ecosadmin::filter_old_packages { ol # ---------------------------------------------------------------------------- # Process_add_packages. This routine is responsible for installing packages -# into the eCos repository using the gunzip and tar tools which must be on +# into the eCos repository using the gzip and tar tools which must be on # the path # @@ -1095,12 +1095,12 @@ proc ecosadmin::process_add_package { } if { $ecosadmin::extract_license_arg == 1 } { # extract the license file (if any) from the specified gzipped tar archive file delete $licensefile - catch { exec > $ecosadmin::null_device gunzip < $abs_package | tar xf - $licensefile } + catch { exec > $ecosadmin::null_device gzip -d < $abs_package | tar xf - $licensefile } return } # extract the package data file from the specified gzipped tar archive - if { [ catch { exec > $ecosadmin::null_device gunzip < $abs_package | tar xf - $datafile } message ] != 0 } { + if { [ catch { exec > $ecosadmin::null_device gzip -d < $abs_package | tar xf - $datafile } message ] != 0 } { fatal_error "extracting $datafile:\n$message" } @@ -1112,7 +1112,7 @@ proc ecosadmin::process_add_package { } } # extract the remaining package contents and generate a list of extracted files - if { [ catch { exec gunzip < $abs_package | tar xvf - > $logfile } message ] != 0 } { + if { [ catch { exec gzip -d < $abs_package | tar xvf - > $logfile } message ] != 0 } { file delete $logfile fatal_error "extracting files:\n$message" } @@ -1202,7 +1202,7 @@ proc ecosadmin::accept_license { archive } # extract the specified license file from the specified gzipped tar archive - if { [ catch { exec > $ecosadmin::null_device gunzip < $archivename | tar xf - $filename } message ] != 0 } { + if { [ catch { exec > $ecosadmin::null_device gzip -d < $archivename | tar xf - $filename } message ] != 0 } { # no license file return "y" }