diff options
author | dgp <dgp@noemail.net> | 2006-04-05 01:20:51 (GMT) |
---|---|---|
committer | dgp <dgp@noemail.net> | 2006-04-05 01:20:51 (GMT) |
commit | 3c990165ae264350c33542d7024892d1480f0495 (patch) | |
tree | 8158c834636e40fe575b30dc89560b9401919333 /generic/tclPkg.c | |
parent | 84b4dd95fba4ff9f875b68f078f777b38cd32e08 (diff) | |
download | tcl-3c990165ae264350c33542d7024892d1480f0495.zip tcl-3c990165ae264350c33542d7024892d1480f0495.tar.gz tcl-3c990165ae264350c33542d7024892d1480f0495.tar.bz2 |
* 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.
FossilOrigin-Name: a37aac53e5604cc00ba7711c5ae48a2bf78c7eb3
Diffstat (limited to 'generic/tclPkg.c')
-rw-r--r-- | generic/tclPkg.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/generic/tclPkg.c b/generic/tclPkg.c index 6a46981..3453020 100644 --- a/generic/tclPkg.c +++ b/generic/tclPkg.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclPkg.c,v 1.9.2.2 2005/11/18 19:27:19 dgp Exp $ + * RCS: @(#) $Id: tclPkg.c,v 1.9.2.3 2006/04/05 01:20:53 dgp Exp $ */ #include "tclInt.h" @@ -355,8 +355,12 @@ Tcl_PkgRequireEx(interp, name, version, exact, clientDataPtr) * It's a bit too harsh to make a large number of * existing packages start failing by releasing a * new patch release, so we forgive this type of error - * for the rest of the Tcl 8.4 series, and only report - * a warning. We limit the error reporting to only + * for the rest of the Tcl 8.4 series. + * + * We considered reporting a warning, but in practice + * even that appears too harsh a change for a patch release. + * + * We limit the error reporting to only * the situation where a broken ifneeded script leads * to a failure to satisfy the requirement. */ @@ -373,8 +377,9 @@ Tcl_PkgRequireEx(interp, name, version, exact, clientDataPtr) " provided instead", NULL); } } + /* + * Warning generation now disabled if (code == TCL_OK) { - /* Forgiving the error, report warning instead */ Tcl_Obj *msg = Tcl_NewStringObj( "attempt to provide package ", -1); Tcl_Obj *cmdPtr = Tcl_NewListObj(0, NULL); @@ -389,6 +394,7 @@ Tcl_PkgRequireEx(interp, name, version, exact, clientDataPtr) Tcl_DecrRefCount(cmdPtr); Tcl_ResetResult(interp); } + */ } } else if (code != TCL_ERROR) { Tcl_Obj *codePtr = Tcl_NewIntObj(code); |