[89811] trunk/base

[Joshua Root]

On 2012-2-11 20:04 , and.damore at macports.org wrote:
> Revision: 89811
>           http://trac.macports.org/changeset/89811
> Author:   and.damore at macports.org
> Date:     2012-02-11 01:04:12 -0800 (Sat, 11 Feb 2012)
> Log Message:
> -----------
> base: command "rpm-vercomp" replaced with "vercmp" in code, cf. r89810
> 
> Revision Links:
> --------------
>     http://trac.macports.org/changeset/89810
> 
> Modified Paths:
> --------------
>     trunk/base/src/pextlib1.0/Pextlib.c
>     trunk/base/tests/test/xcodeversion/Portfile
> 
> Modified: trunk/base/src/pextlib1.0/Pextlib.c
> ===================================================================
> --- trunk/base/src/pextlib1.0/Pextlib.c	2012-02-11 08:55:39 UTC (rev 89810)
> +++ trunk/base/src/pextlib1.0/Pextlib.c	2012-02-11 09:04:12 UTC (rev 89811)
> @@ -588,10 +588,7 @@
>  	Tcl_CreateObjCommand(interp, "xinstall", InstallCmd, NULL, NULL);
>  	Tcl_CreateObjCommand(interp, "fs-traverse", FsTraverseCmd, NULL, NULL);
>  	Tcl_CreateObjCommand(interp, "filemap", FilemapCmd, NULL, NULL);
> -#if 1
> -	/* the name "rpm-vercomp" is deprecated, use "vercmp" instead */
> -	Tcl_CreateObjCommand(interp, "rpm-vercomp", VercompCmd, NULL, NULL);
> -#endif
> +	/* "rpm-vercomp" command removed in r89810, replaced by "vercmp" */
>  	Tcl_CreateObjCommand(interp, "vercmp", VercompCmd, NULL, NULL);
>  	Tcl_CreateObjCommand(interp, "rmd160", RMD160Cmd, NULL, NULL);
>  	Tcl_CreateObjCommand(interp, "sha256", SHA256Cmd, NULL, NULL);

It's way too soon to do this. Revert please.

> Modified: trunk/base/tests/test/xcodeversion/Portfile
> ===================================================================
> --- trunk/base/tests/test/xcodeversion/Portfile	2012-02-11 08:55:39 UTC (rev 89810)
> +++ trunk/base/tests/test/xcodeversion/Portfile	2012-02-11 09:04:12 UTC (rev 89811)
> @@ -21,7 +21,7 @@
>  test {
>  	# rpm-vercomp is now deprecated, change it here too when removed
>  	# from all ports and base (but keep this test here, meanwhile...)
> -	if {$xcodeversion != "" && [rpm-vercomp $xcodeversion 2.1] >= 0} {
> +	if {$xcodeversion != "" && [vercomp $xcodeversion 2.1] >= 0} {
>  		ui_msg "xcodeversion >= 2.1"
>  	} else {
>  		ui_msg "xcodeversion = $xcodeversion"

Error: Target org.macports.test returned: invalid command name "vercomp"

- Josh