From a9e197a7ae5fbaf4553abbe4bdd7b287c6fe16b1 Mon Sep 17 00:00:00 2001 From: dgp Date: Wed, 5 Apr 2006 01:42:10 +0000 Subject: * generic/tclPkg.c: Revised Bug 1162286 fix from 2005-11-08 * tests/pkg.test: to be even more forgiving of package version mismatch errors in [package ifneeded] commands, not even logging any warning messages. This further reduces the ***POTENTIAL INCOMPATIBILITY*** noted for that change. --- ChangeLog | 8 ++++---- tests/pkg.test | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6e5b5da..a56bd78 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,10 @@ 2006-04-04 Don Porter * generic/tclPkg.c: Revised Bug 1162286 fix from 2005-11-08 - to be even more forgiving of package version mismatch errors in - [package ifneeded] commands, not even logging any warning messages. - This further reduces the ***POTENTIAL INCOMPATIBILITY*** noted for - that change. + * tests/pkg.test: to be even more forgiving of package version + mismatch errors in [package ifneeded] commands, not even logging any + warning messages. This further reduces the + ***POTENTIAL INCOMPATIBILITY*** noted for that change. 2006-04-03 Andreas Kupries diff --git a/tests/pkg.test b/tests/pkg.test index d3796af..83488a1 100644 --- a/tests/pkg.test +++ b/tests/pkg.test @@ -10,7 +10,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: pkg.test,v 1.9.12.3 2005/12/02 17:17:13 dgp Exp $ +# RCS: @(#) $Id: pkg.test,v 1.9.12.4 2006/04/05 01:42:16 dgp Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest 2 @@ -351,7 +351,7 @@ test pkg-2.34 {Tcl_PkgRequire: consistent return values (1162286)} -setup { package require foo 1 } -cleanup { package forget foo -} -match glob -result 1.1 -errorOutput {attempt to provide package * failed:*} +} -result 1.1 test pkg-2.34.1 {Tcl_PkgRequire: consistent return values (1162286)} -setup { package forget foo } -body { @@ -359,7 +359,7 @@ test pkg-2.34.1 {Tcl_PkgRequire: consistent return values (1162286)} -setup { package require foo 1 } -cleanup { package forget foo -} -match glob -result 1 -errorOutput {attempt to provide package * failed:*} +} -result 1 test pkg-2.34.2 {Tcl_PkgRequire: consistent return values (1162286)} -setup { package forget foo } -body { -- cgit v0.12