You can subscribe to this list here.
2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
(1) |
Dec
(14) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2002 |
Jan
(3) |
Feb
(9) |
Mar
(39) |
Apr
|
May
|
Jun
(7) |
Jul
(2) |
Aug
(2) |
Sep
|
Oct
(1) |
Nov
|
Dec
|
2003 |
Jan
|
Feb
|
Mar
(30) |
Apr
(10) |
May
(52) |
Jun
(32) |
Jul
(18) |
Aug
(6) |
Sep
(32) |
Oct
(70) |
Nov
(18) |
Dec
(29) |
2004 |
Jan
(23) |
Feb
(6) |
Mar
(3) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
(2) |
Nov
|
Dec
|
2005 |
Jan
(1) |
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(8) |
Dec
(1) |
2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(4) |
2007 |
Jan
|
Feb
|
Mar
|
Apr
(5) |
May
(11) |
Jun
|
Jul
(3) |
Aug
(1) |
Sep
|
Oct
(4) |
Nov
|
Dec
|
2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(7) |
Nov
|
Dec
|
2009 |
Jan
|
Feb
(4) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2011 |
Jan
|
Feb
|
Mar
(7) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: Michael R. <mr...@us...> - 2005-11-03 23:20:12
|
Update of /cvsroot/wigwam/wigwam-base/sh-macros/wigwam-env-api-tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18229/sh-macros/wigwam-env-api-tests Modified Files: Makefile.am ww_app_colon ww_app_delim ww_env_api_reset ww_has_componant ww_int ww_int_app_colon ww_int_clear ww_int_load_exports ww_int_pre_colon ww_int_set ww_pre_colon ww_pre_delim ww_set ww_usage Log Message: make "make distcheck" work Index: Makefile.am =================================================================== RCS file: /cvsroot/wigwam/wigwam-base/sh-macros/wigwam-env-api-tests/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile.am 3 Oct 2003 00:12:58 -0000 1.3 +++ Makefile.am 3 Nov 2005 23:20:03 -0000 1.4 @@ -14,4 +14,4 @@ ww_usage \ ww_set -EXTRA_DIST=$(TESTS) +EXTRA_DIST=$(TESTS) test_functions Index: ww_app_colon =================================================================== RCS file: /cvsroot/wigwam/wigwam-base/sh-macros/wigwam-env-api-tests/ww_app_colon,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ww_app_colon 24 Sep 2003 01:11:04 -0000 1.1 +++ ww_app_colon 3 Nov 2005 23:20:03 -0000 1.2 @@ -1,8 +1,8 @@ #!/bin/sh -. ../ww-env-api +. $srcdir/../ww-env-api -. ./test_functions +. $srcdir/test_functions foo="" ww_app_colon foo bar:blah Index: ww_app_delim =================================================================== RCS file: /cvsroot/wigwam/wigwam-base/sh-macros/wigwam-env-api-tests/ww_app_delim,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ww_app_delim 24 Sep 2003 01:11:04 -0000 1.1 +++ ww_app_delim 3 Nov 2005 23:20:03 -0000 1.2 @@ -1,8 +1,8 @@ #!/bin/sh -. ../ww-env-api +. $srcdir/../ww-env-api -. ./test_functions +. $srcdir/test_functions foo="" ww_app_delim foo foo : Index: ww_env_api_reset =================================================================== RCS file: /cvsroot/wigwam/wigwam-base/sh-macros/wigwam-env-api-tests/ww_env_api_reset,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ww_env_api_reset 24 Sep 2003 01:11:04 -0000 1.1 +++ ww_env_api_reset 3 Nov 2005 23:20:03 -0000 1.2 @@ -9,9 +9,9 @@ exit 0 } -. ../ww-env-api +. $srcdir/../ww-env-api -. ./test_functions +. $srcdir/test_functions ww_env_api_reset Index: ww_has_componant =================================================================== RCS file: /cvsroot/wigwam/wigwam-base/sh-macros/wigwam-env-api-tests/ww_has_componant,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ww_has_componant 24 Sep 2003 01:11:04 -0000 1.1 +++ ww_has_componant 3 Nov 2005 23:20:03 -0000 1.2 @@ -1,8 +1,8 @@ #!/bin/sh -. ../ww-env-api +. $srcdir/../ww-env-api -. ./test_functions +. $srcdir/test_functions my_die () { die "test #$compare_count: $@" Index: ww_int =================================================================== RCS file: /cvsroot/wigwam/wigwam-base/sh-macros/wigwam-env-api-tests/ww_int,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ww_int 24 Sep 2003 01:11:04 -0000 1.1 +++ ww_int 3 Nov 2005 23:20:03 -0000 1.2 @@ -1,9 +1,8 @@ #!/bin/sh -. ../ww-env-api - -. ./test_functions +. $srcdir/../ww-env-api +. $srcdir/test_functions interactive_variables="" ww_int foo Index: ww_int_app_colon =================================================================== RCS file: /cvsroot/wigwam/wigwam-base/sh-macros/wigwam-env-api-tests/ww_int_app_colon,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ww_int_app_colon 24 Sep 2003 01:11:04 -0000 1.1 +++ ww_int_app_colon 3 Nov 2005 23:20:03 -0000 1.2 @@ -1,9 +1,8 @@ #!/bin/sh -. ../ww-env-api - -. ./test_functions +. $srcdir/../ww-env-api +. $srcdir/test_functions # *_check VARIABLE VALUE EXPECTED_VALUE Index: ww_int_clear =================================================================== RCS file: /cvsroot/wigwam/wigwam-base/sh-macros/wigwam-env-api-tests/ww_int_clear,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ww_int_clear 24 Sep 2003 01:11:04 -0000 1.1 +++ ww_int_clear 3 Nov 2005 23:20:03 -0000 1.2 @@ -1,8 +1,8 @@ #!/bin/sh -. ../ww-env-api +. $srcdir/../ww-env-api -. ./test_functions +. $srcdir/test_functions interactive_variables="balah balh blah" ww_int_clear Index: ww_int_load_exports =================================================================== RCS file: /cvsroot/wigwam/wigwam-base/sh-macros/wigwam-env-api-tests/ww_int_load_exports,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ww_int_load_exports 24 Sep 2003 01:11:04 -0000 1.1 +++ ww_int_load_exports 3 Nov 2005 23:20:03 -0000 1.2 @@ -1,6 +1,6 @@ #!/bin/sh -. ../ww-env-api +. $srcdir/../ww-env-api # ww_int_load_exports Index: ww_int_pre_colon =================================================================== RCS file: /cvsroot/wigwam/wigwam-base/sh-macros/wigwam-env-api-tests/ww_int_pre_colon,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ww_int_pre_colon 24 Sep 2003 01:11:04 -0000 1.1 +++ ww_int_pre_colon 3 Nov 2005 23:20:03 -0000 1.2 @@ -1,8 +1,8 @@ #!/bin/sh -. ../ww-env-api +. $srcdir/../ww-env-api -. ./test_functions +. $srcdir/test_functions # *_check VARIABLE VALUE EXPECTED_VALUE Index: ww_int_set =================================================================== RCS file: /cvsroot/wigwam/wigwam-base/sh-macros/wigwam-env-api-tests/ww_int_set,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ww_int_set 24 Sep 2003 01:11:04 -0000 1.1 +++ ww_int_set 3 Nov 2005 23:20:03 -0000 1.2 @@ -1,8 +1,8 @@ #!/bin/sh -. ../ww-env-api +. $srcdir/../ww-env-api -. ./test_functions +. $srcdir/test_functions # ww_int_set Index: ww_pre_colon =================================================================== RCS file: /cvsroot/wigwam/wigwam-base/sh-macros/wigwam-env-api-tests/ww_pre_colon,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ww_pre_colon 24 Sep 2003 01:11:04 -0000 1.1 +++ ww_pre_colon 3 Nov 2005 23:20:03 -0000 1.2 @@ -1,8 +1,8 @@ #!/bin/sh -. ../ww-env-api +. $srcdir/../ww-env-api -. ./test_functions +. $srcdir/test_functions # ww_pre_colon Index: ww_pre_delim =================================================================== RCS file: /cvsroot/wigwam/wigwam-base/sh-macros/wigwam-env-api-tests/ww_pre_delim,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ww_pre_delim 24 Sep 2003 01:11:04 -0000 1.1 +++ ww_pre_delim 3 Nov 2005 23:20:03 -0000 1.2 @@ -1,8 +1,8 @@ #!/bin/sh -. ../ww-env-api +. $srcdir/../ww-env-api -. ./test_functions +. $srcdir/test_functions foo="" ww_pre_delim foo foo : Index: ww_set =================================================================== RCS file: /cvsroot/wigwam/wigwam-base/sh-macros/wigwam-env-api-tests/ww_set,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ww_set 24 Sep 2003 01:11:04 -0000 1.1 +++ ww_set 3 Nov 2005 23:20:03 -0000 1.2 @@ -1,8 +1,8 @@ #!/bin/sh -. ../ww-env-api +. $srcdir/../ww-env-api -. ./test_functions +. $srcdir/test_functions # ww_int Index: ww_usage =================================================================== RCS file: /cvsroot/wigwam/wigwam-base/sh-macros/wigwam-env-api-tests/ww_usage,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ww_usage 24 Sep 2003 01:44:47 -0000 1.1 +++ ww_usage 3 Nov 2005 23:20:03 -0000 1.2 @@ -21,7 +21,7 @@ ww_int_load_exports \ ; do - sh -c ". ../ww-env-api; $function " | + sh -c ". $srcdir/../ww-env-api; $function " | grep "$function" >/dev/null || { echo >&2 "$0 usage for $function failed"; |
From: Michael R. <mr...@us...> - 2005-11-03 23:19:54
|
Update of /cvsroot/wigwam/wigwam-base In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18027 Modified Files: Makefile.am Log Message: use distcheck-hook instead of old hokey mechanism, since newer automake seems to want to include conditional programs' sources in the distribution unconditionally Index: Makefile.am =================================================================== RCS file: /cvsroot/wigwam/wigwam-base/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Makefile.am 29 Sep 2003 02:22:44 -0000 1.7 +++ Makefile.am 3 Nov 2005 23:19:47 -0000 1.8 @@ -23,11 +23,10 @@ make -C doc documentation-support if WW_CAN_BUILD_DOCS +distcheck-hook: + exit 0 else -bin_PROGRAMS = foo -foo_SOURCES = testingdist - -testingdist: +distcheck-hook: @echo "Sorry you cannot build the docs because you don't"; \ echo "have the right tools. therefore you cannot run make dist"; \ echo "you can make testdist which will make a dist for testing"; \ |
From: Michael R. <mr...@us...> - 2005-11-03 23:18:23
|
Update of /cvsroot/wigwam/wigwam-base/versiontool In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17594 Modified Files: test-versiontool-0 Log Message: fix broken test Index: test-versiontool-0 =================================================================== RCS file: /cvsroot/wigwam/wigwam-base/versiontool/test-versiontool-0,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- test-versiontool-0 22 Mar 2004 22:40:59 -0000 1.3 +++ test-versiontool-0 3 Nov 2005 23:18:16 -0000 1.4 @@ -193,7 +193,9 @@ spec_test '[10,20]' 10 15 20 10.1 20.1 -- 9.99 21.0 spec_test '[1.2,1.4)' 1.2 1.3 1.3.999 1.2.0.1.3.a -- 1.4 1.4.0 1.4.0.0 1.1.99 -spec_test '[1.17-1,*)' 1.19 -- 1.16 +# XXX: the '*' character does not seem to be supported in libversion.c...? +#spec_test '[1.17-1,*)' 1.19 -- 1.16 +spec_test '[1.17-1,)' 1.19 -- 1.16 split_test a b 1 split_test hello 0.0 44 |
From: Michael R. <mr...@us...> - 2005-11-03 22:36:46
|
Update of /cvsroot/wigwam/wigwam-base In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7835 Modified Files: ChangeLog configure.in Log Message: preparing for 3.1.1 release Index: ChangeLog =================================================================== RCS file: /cvsroot/wigwam/wigwam-base/ChangeLog,v retrieving revision 1.156 retrieving revision 1.157 diff -u -r1.156 -r1.157 --- ChangeLog 25 Mar 2005 23:46:38 -0000 1.156 +++ ChangeLog 3 Nov 2005 22:36:32 -0000 1.157 @@ -1,4 +1,4 @@ -wigwam-base (3.1.0.1) +wigwam-base (3.1.1) * bug fix: pubtool publish sometimes gave a broken pipe message when running get-latest-tag. (fess) @@ -13,7 +13,7 @@ * bug fix: fix syntax error in projectctl (mrad) * bug fix: use 'cvs -f log -t' so that a cvsrc won't break tag lookup (fess) - -- not yet released.. + -- Mike Radford <mr...@bl...> Thu, Nov 3 2005 14:30:00 PST wigwam-base (3.1) Index: configure.in =================================================================== RCS file: /cvsroot/wigwam/wigwam-base/configure.in,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- configure.in 27 Jan 2004 17:21:00 -0000 1.51 +++ configure.in 3 Nov 2005 22:36:32 -0000 1.52 @@ -1,6 +1,6 @@ builtin(include, m4-macros/curses.m4) AC_INIT(bin-scripts) -AM_INIT_AUTOMAKE(wigwam-base, 3.1.0.1) +AM_INIT_AUTOMAKE(wigwam-base, 3.1.1) AM_MAINTAINER_MODE |
From: Michael R. <mr...@us...> - 2005-11-03 22:35:31
|
Update of /cvsroot/wigwam/wigwam-base/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7601/doc Modified Files: Makefile.am Log Message: placate newer (?) automake Index: Makefile.am =================================================================== RCS file: /cvsroot/wigwam/wigwam-base/doc/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile.am 5 Mar 2004 17:17:25 -0000 1.3 +++ Makefile.am 3 Nov 2005 22:35:12 -0000 1.4 @@ -15,7 +15,7 @@ mandir = $(prefix)/share/man -man1dir = $(mandir)/man1 +manonedir = $(mandir)/man1 included_txt = wigwam.txt @@ -39,7 +39,7 @@ distcheat: ; # install the manpages in share/man/man?/ -man1_DATA = $(man1pages) +manone_DATA = $(man1pages) doc_DATA = $(included_txt) endif |
From: fess <fe...@us...> - 2005-03-25 23:46:49
|
Update of /cvsroot/wigwam/wigwam-base In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22037 Modified Files: ChangeLog Log Message: Index: ChangeLog =================================================================== RCS file: /cvsroot/wigwam/wigwam-base/ChangeLog,v retrieving revision 1.155 retrieving revision 1.156 diff -u -r1.155 -r1.156 --- ChangeLog 28 Oct 2004 18:17:33 -0000 1.155 +++ ChangeLog 25 Mar 2005 23:46:38 -0000 1.156 @@ -11,6 +11,7 @@ for publishing. [backport from ww4] (fess) * bug fix: versiontool would infinite loop on certain comparisons (fess) * bug fix: fix syntax error in projectctl (mrad) + * bug fix: use 'cvs -f log -t' so that a cvsrc won't break tag lookup (fess) -- not yet released.. |
From: fess <fe...@us...> - 2005-03-25 23:45:07
|
Update of /cvsroot/wigwam/wigwam-base/publish-scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20037 Modified Files: get-last-tag.in Log Message: if someone has a .cvsrc that has 'log -N' in it, then this command will fail. as the -N says don't print the symbolic tag. so. use 'cvs -f' to not read any cvsrc. Index: get-last-tag.in =================================================================== RCS file: /cvsroot/wigwam/wigwam-base/publish-scripts/get-last-tag.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- get-last-tag.in 27 Jan 2004 16:46:50 -0000 1.3 +++ get-last-tag.in 25 Mar 2005 23:44:53 -0000 1.4 @@ -22,9 +22,9 @@ my ($prefix, $ref_file) = @ARGV; $ref_file ||= $0; -# Run 'cvs log -t' on reference file. +# Run 'cvs -f log -t' on reference file. -my $command = "cvs log -t $ref_file"; +my $command = "cvs -f log -t $ref_file"; if (!open(F, "$command |")) { print STDERR "$0: error running command '$command'\n"; exit(1); |
From: Dave B. <dav...@us...> - 2005-01-10 22:38:54
|
Update of /cvsroot/wigwam/wigwam-base/bin-scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12522 Modified Files: projectctl Log Message: add PKG_CONFIG_PATH setting to projectctl. Index: projectctl =================================================================== RCS file: /cvsroot/wigwam/wigwam-base/bin-scripts/projectctl,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- projectctl 28 Oct 2004 18:13:14 -0000 1.11 +++ projectctl 10 Jan 2005 22:38:46 -0000 1.12 @@ -86,8 +86,10 @@ LIBS="-L$PLAYPEN_ROOT/lib -L$PLAYPEN_ROOT/ext/lib" CPPFLAGS="-I$PLAYPEN_ROOT/include -I$PLAYPEN_ROOT/ext/include" +PKG_CONFIG_PATH="$PLAYPEN_ROOT/ext/lib/pkgconfig:$PLAYPEN_ROOT/lib/pkgconfig" export LIBS export CPPFLAGS +export PKG_CONFIG_PATH if test "x$WIGWAM_PROPELLER_MODE" = "x" ; then WIGWAM_PROPELLER_MODE="stderr" |
From: Michael R. <mr...@us...> - 2004-10-28 18:17:42
|
Update of /cvsroot/wigwam/wigwam-base In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15637 Modified Files: ChangeLog Log Message: Index: ChangeLog =================================================================== RCS file: /cvsroot/wigwam/wigwam-base/ChangeLog,v retrieving revision 1.154 retrieving revision 1.155 diff -u -r1.154 -r1.155 --- ChangeLog 23 Sep 2004 21:53:17 -0000 1.154 +++ ChangeLog 28 Oct 2004 18:17:33 -0000 1.155 @@ -10,6 +10,7 @@ * pubtool now uses underlying revision control to lock a cluster for publishing. [backport from ww4] (fess) * bug fix: versiontool would infinite loop on certain comparisons (fess) + * bug fix: fix syntax error in projectctl (mrad) -- not yet released.. |
From: Michael R. <mr...@us...> - 2004-10-28 18:13:34
|
Update of /cvsroot/wigwam/wigwam-base/bin-scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14816/bin-scripts Modified Files: projectctl Log Message: fix syntax error when try_configure not set Index: projectctl =================================================================== RCS file: /cvsroot/wigwam/wigwam-base/bin-scripts/projectctl,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- projectctl 14 Jan 2004 01:24:17 -0000 1.10 +++ projectctl 28 Oct 2004 18:13:14 -0000 1.11 @@ -173,7 +173,7 @@ elif $test_x "$PLAYPEN_ROOT/src/configure" ; then try_configure=1 fi - if test $try_configure = 1 ; then + if test "x$try_configure" = x1 ; then cd "$PLAYPEN_ROOT/src" ./configure --prefix="$PLAYPEN_ROOT" || { echo "$id: configure failed: consult above errors." 1>&2 |
From: fess <fe...@us...> - 2004-09-23 21:53:35
|
Update of /cvsroot/wigwam/wigwam-base/versiontool In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24521/versiontool Modified Files: libversion.c Log Message: given 1.a and 1.1 versiontool would infinite loop. Index: libversion.c =================================================================== RCS file: /cvsroot/wigwam/wigwam-base/versiontool/libversion.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libversion.c 26 May 2003 15:38:38 -0000 1.2 +++ libversion.c 23 Sep 2004 21:53:17 -0000 1.3 @@ -72,6 +72,11 @@ else return compare_version_letters (*a, *b); } + else + { + /* letters come before numbers */ + return isalpha(*a) ? -1 : 1; + } } if (a_length > 0) return +1; @@ -188,8 +193,10 @@ */ if (piece_len == 0) return 1; + /* 'any' matches any version */ if (piece_len == 3 && memcmp (piece, "any", 3) == 0) return 1; + /* '-' matches any version */ if (piece_len == 1 && piece[0] == '-') return 1; |
From: fess <fe...@us...> - 2004-09-23 21:53:35
|
Update of /cvsroot/wigwam/wigwam-base In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24521 Modified Files: ChangeLog Log Message: given 1.a and 1.1 versiontool would infinite loop. Index: ChangeLog =================================================================== RCS file: /cvsroot/wigwam/wigwam-base/ChangeLog,v retrieving revision 1.153 retrieving revision 1.154 diff -u -r1.153 -r1.154 --- ChangeLog 26 Feb 2004 23:19:00 -0000 1.153 +++ ChangeLog 23 Sep 2004 21:53:17 -0000 1.154 @@ -9,6 +9,7 @@ newer versions of perl. (mrad) * pubtool now uses underlying revision control to lock a cluster for publishing. [backport from ww4] (fess) + * bug fix: versiontool would infinite loop on certain comparisons (fess) -- not yet released.. |
From: fess <fe...@us...> - 2004-03-22 22:51:22
|
Update of /cvsroot/wigwam/wigwam-base/versiontool In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17972 Modified Files: test-versiontool-0 Log Message: add a spec_test Index: test-versiontool-0 =================================================================== RCS file: /cvsroot/wigwam/wigwam-base/versiontool/test-versiontool-0,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- test-versiontool-0 26 May 2003 15:38:38 -0000 1.2 +++ test-versiontool-0 22 Mar 2004 22:40:59 -0000 1.3 @@ -193,6 +193,7 @@ spec_test '[10,20]' 10 15 20 10.1 20.1 -- 9.99 21.0 spec_test '[1.2,1.4)' 1.2 1.3 1.3.999 1.2.0.1.3.a -- 1.4 1.4.0 1.4.0.0 1.1.99 +spec_test '[1.17-1,*)' 1.19 -- 1.16 split_test a b 1 split_test hello 0.0 44 |
From: fess <fe...@us...> - 2004-03-05 17:39:33
|
Update of /cvsroot/wigwam/wigwam-base/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14285 Modified Files: .cvsignore Makefile.am Log Message: create transitional ( and annoyingly complex ) make rules to create xml files from the sgml files. Index: .cvsignore =================================================================== RCS file: /cvsroot/wigwam/wigwam-base/doc/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 28 Dec 2001 23:44:04 -0000 1.2 +++ .cvsignore 5 Mar 2004 17:17:25 -0000 1.3 @@ -7,3 +7,33 @@ *.1 wigwam-html wigwam-html1 +clusterctl.xml +clusterctl_entities +extEntities.dtf +intro.xml +intro_entities +packagectl.xml +packagectl_entities +process.extEntities.dtf +process.xml +process_entities +projectctl.extEntities.dtf +projectctl.xml +projectctl.xml.tmp +projectctl_entities +projectl_entities +pubtool.xml +pubtool_entities +servicectl.xml +servicectl_entities +versiontool.extEntities.dtf +versiontool.xml +versiontool_entities +wigwam.extEntities.dtf +wigwam.xml +wigwam.xml.tmp +wigwam.xml.tmp2 +wigwam_entities +wparallelizer.xml +wparallelizer_entities +xml_entities Index: Makefile.am =================================================================== RCS file: /cvsroot/wigwam/wigwam-base/doc/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile.am 16 Mar 2003 05:39:46 -0000 1.2 +++ Makefile.am 5 Mar 2004 17:17:25 -0000 1.3 @@ -5,6 +5,7 @@ servicectl.sgml \ clusterctl.sgml \ wparallelizer.sgml + man1pages = $(patsubst %.sgml, %.1, $(sgml_man1pages)) manpages = $(man1pages) @@ -80,3 +81,78 @@ documentation-support: manpages .PHONY: man-pages + +## This next bunch of hackery is to transition the docbook sgml +## files to docbook xml. I only did this, so that +## the sgml files could be the master document until +## all the make rules are in place to make ps, pdf, html, +## text, and man, from the xml sources. + +## the plan is basically this, use osx ( from openjade ) +## to convert sgml to xml, however fragments are included in the +## wigwam sgml document via external entities. these cannot +## be processed as standalone documents, because they +## have links to other parts of the wigwam.sgml document. +## they are created however when we use osx on the +## wigwam.sgml document. So, for foo.sgml, if foo.xml +## was created when using osx on wigwam.sgml then +## just use that. Otherwise use osx on foo.sgml + +sgml_files = \ +clusterctl.sgml \ +intro.sgml \ +packagectl.sgml \ +process.sgml \ +projectctl.sgml \ +pubtool.sgml \ +servicectl.sgml \ +versiontool.sgml \ +wigwam.sgml \ +wparallelizer.sgml + +xml_files = $(patsubst %.sgml, %.xml, $(sgml_files)) + +xml: wigwam.xml + +%.xml: %.xml.tmp + xmllint --format $*.xml.tmp > $*.xml.in && mv $*.xml.in $*.xml; + @if test -r wigwam_entities/$*.xml; then \ + echo "$*.xml appears to be an entity from wigwam.sgml"; \ + echo "removing the xml declaration. "; \ + $(PERL) -i -pe 's/^<\?xml[^>]*>\n?//;' $*.xml; \ + fi; + +# dia is not allowed in docbook. ( and osx will not process them. ) +# also give the fragments a doctype if they don't have one. +# so osx can process them +%.sgml.tmp: %.sgml + @echo substituting $*.sgml + @$(PERL) -pe 's/format="dia"//ig' $*.sgml > $*.sgml.tmp + @$(PERL) -i -pe '$$matched++ if m/^<!doctype/i; !$$matched && s,^<(\w+),<!doctype $$1 PUBLIC "-//OASIS//DTD DocBook V3.1//EN">\n<$$1, && $$matched++ ' $*.sgml.tmp + +%.xml.tmp: wigwam.xml.tmp %.sgml.tmp + @if test -r wigwam_entities/$*.xml; then \ + echo "using xml file from osx parse of wigwam.sgml"; \ + cp wigwam_entities/$*.xml ./$*.xml.tmp; \ + else \ + if \ + echo "running osx on $*.sgml.tmp"; \ + rm -rf $*_entities; \ + mkdir $*_entities; \ + osx -xno-nl-in-tag -xlower -xno-expand-external \ + -d$*_entities \ + $*.sgml.tmp > $*.xml.tmp.in && \ + mv $*.xml.tmp.in $*.xml.tmp ; then \ + rm -f $*.xml.tmp.in; \ + $(PERL) -i -pe 's/extEntities.dtf/$*.extEntities.dtf/' $*.xml.tmp; \ + $(PERL) -pe 's/sgml/xml/g' $*_entities/extEntities.dtf > $*.extEntities.dtf; \ + else \ + exit 1; \ + fi; \ + fi; + +wigwam.xml: wigwam.xml.tmp $(xml_files) + $(PERL) -i -pe 's,(^<!DOCTYPE\s+\S+\s+).*\[,$${1}PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ ,i' wigwam.xml.tmp + xmllint --format wigwam.xml.tmp > wigwam.xml.in && mv wigwam.xml.in wigwam.xml; + @rm -f wigwam.xml.in + $(PERL) -i -ne 'print unless /extEntities.dtf/' wigwam.xml |
From: fess <fe...@us...> - 2004-03-05 17:38:08
|
Update of /cvsroot/wigwam/wigwam-base/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14056 Modified Files: versiontool.sgml Log Message: must close ref entry, and there's no docbook element called program. Index: versiontool.sgml =================================================================== RCS file: /cvsroot/wigwam/wigwam-base/doc/versiontool.sgml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- versiontool.sgml 13 May 2003 02:23:05 -0000 1.1 +++ versiontool.sgml 5 Mar 2004 17:16:00 -0000 1.2 @@ -30,7 +30,7 @@ <refsect1> <title>About versiontool</title> <para> -<program>versiontool</program> is a shell-friendly interface +<command>versiontool</command> is a shell-friendly interface for comparing, sorting and selecting version numbers. </para> </refsect1> @@ -59,4 +59,4 @@ VERSION-PIECE = substring without '.', ',', '-', ';' </programlisting> </refsect1> -<refentry> +</refentry> |
From: fess <fe...@us...> - 2004-02-26 23:35:09
|
Update of /cvsroot/wigwam/wigwam-base In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24841 Modified Files: ChangeLog Log Message: pubtool cluster locking.. yea. thanks to ww4 for coming up with a good technique. Index: ChangeLog =================================================================== RCS file: /cvsroot/wigwam/wigwam-base/ChangeLog,v retrieving revision 1.152 retrieving revision 1.153 diff -u -r1.152 -r1.153 --- ChangeLog 26 Feb 2004 22:34:23 -0000 1.152 +++ ChangeLog 26 Feb 2004 23:19:00 -0000 1.153 @@ -7,6 +7,8 @@ if --pid argument was not used. (fess/fongd) * bug fix: diff-playpens, used in publishing, now works properly with newer versions of perl. (mrad) + * pubtool now uses underlying revision control to lock a cluster + for publishing. [backport from ww4] (fess) -- not yet released.. |
From: fess <fe...@us...> - 2004-02-26 23:35:09
|
Update of /cvsroot/wigwam/wigwam-base/bin-scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24841/bin-scripts Modified Files: pubtool Log Message: pubtool cluster locking.. yea. thanks to ww4 for coming up with a good technique. Index: pubtool =================================================================== RCS file: /cvsroot/wigwam/wigwam-base/bin-scripts/pubtool,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- pubtool 29 Jan 2004 17:11:37 -0000 1.18 +++ pubtool 26 Feb 2004 23:19:01 -0000 1.19 @@ -48,6 +48,8 @@ diff Generate a \`cvs diff' between two versions. publish Publish a version of the site to the cluster stage Update the site on your local computer. + lock manually lock a cluster for publishing. + unlock manually unlock a cluster. Run \`$id COMMAND --help' for help on a particular command. @@ -112,6 +114,20 @@ $TAG_SPECIFICATION_usage" +usage_lock="usage: $id lock CLUSTER + +manually run the lock command used when locking a cluster for publishing + +" + +usage_unlock="usage: $id unlock CLUSTER + +manually run the unlock command used when unlocking a cluster for publishing +somtimes this is needed if you've left a stale lock around. + +" + + usage_stage="usage: $id stage [TAG-SPECIFICATION] Update a site on your local machine. @@ -135,6 +151,37 @@ fi } +# publish_lock_cluster_helper cluster playpen admin_op op_name +_publish_lock_cluster_helper () { + current_dir=`pwd` + ret=0 + test -z "$2" || cd "$2" + if test -r "etc/clusters/$1/hosts"; then + cvs -q admin "$3" "etc/clusters/$1/hosts" >/dev/null + test "$?" = 0 || { + echo >&2 "$id publish_${op_name}_cluster(): cvs lock failed for ${1}!"; + ret=1 + } + else + echo >&2 "$id publish_${op_name}_cluster(): hosts file does not exist for ${1}!"; + ret=1 + fi + cd "$current_dir" + return $ret; +} + +# publish_lock_cluster cluster master_dir +publish_lock_cluster () { + _publish_lock_cluster_helper "$1" "$2" "-l1.1" "lock" +} + +# publish_unlock_cluster cluster master_dir +publish_unlock_cluster () { + _publish_lock_cluster_helper "$1" "$2" "-u1.1" "unlock" +} + +### + # support environment variable override for the table of error messages. if test "x$WPARALLELIZER_ERROR_TABLE_FILE" = x ; then wparallelizer_error_table_opts="" @@ -233,7 +280,7 @@ command="$1" fi case "$command" in - rtag | tag | changes | diff | publish | stage) + rtag | tag | changes | diff | publish | stage | lock | unlock ) ;; *) echo "$id: Unknown command: \`$command'" 1>&2 @@ -369,12 +416,17 @@ unknown=1 ;; esac - if test "$unknown" = 1 && - test "$command" = "publish" && - test "x$cluster_name" = "x" ; then + + if test "$unknown" = 1; then + case "$command" in + publish | unlock | lock ) + if test "x$cluster_name" = "x" ; then cluster_name="$1" unknown=0 fi + ;; + esac + fi if test "$unknown" = 1 ; then echo "$id: unknown option $1" 1>&2 @@ -414,6 +466,10 @@ publish) tag_prefix_cluster="$cluster_name" ;; + lock | unlock) + tag_prefix=not_needed + tag=not_needed + ;; changes | diff | tag | rtag) if test -r "$PLAYPEN_ROOT/etc/cluster" ; then tag_prefix_cluster=`cat "$PLAYPEN_ROOT/etc/cluster"` @@ -448,6 +504,7 @@ tag=HEAD fi + #--------------------------------------------------------------------- # Compute the appropriate tag-name. if test "x$tag" = "x" ; then @@ -544,6 +601,18 @@ run-configurable bin/publish/interpret-cvs-update-output ;; + unlock) + # + publish_unlock_cluster "$cluster_name" "$PLAYPEN_ROOT" && + echo "unlocked $cluster_name." + + ;; + + lock) + publish_lock_cluster "$cluster_name" "$PLAYPEN_ROOT" && + echo "locked $cluster_name." + ;; + stage) # _ # ___| |_ __ _ __ _ ___ @@ -716,22 +785,6 @@ has_use=0 has_postpub=0 - # 1.1. Verify that the clusters' roles are ready to publish. - # XXX: this code cannot work, b/c master_dir isn't built. - # (and shouldn't be...) so this MUST be moved to prepare-new-playpen. -# ( -# . "$PLAYPEN_ROOT/ext/bin/unsetup-env" -# test "x$PLAYPEN_ROOT" = x || { -# echo "$id: unsetup-env failed." 1>&2 -# exit 1 -# } -# "$master_dir"/ext/bin/servicectl check-config cluster "$cluster_name" || { -# echo "$id: some environment variables aren't set," \ -# "consult above errors." 1>&2 -# exit 1 -# } -# ) || exit 1 - # 2. Make scripts (they will be used as input to wparallelizer) # run-precheck Verify that publication should work # w/ permissions etc. @@ -1000,6 +1053,11 @@ esac done + echo "$id: getting publish lock for $cluster_name." + publish_lock_cluster "$cluster_name" "$PLAYPEN_ROOT" || { + echo "$id: Failed to get lock. aborting." + exit 1 + } wpara_opts="$wparallelizer_options $wparallelizer_error_table_opts" $pubtool_debug wparallelizer $quoted_args eval "\$wparallelizer $wpara_opts $quoted_args" @@ -1026,9 +1084,14 @@ *) $maybe_stop_proxy echo "$id: unhandled exit status $?" 1>&2 + publish_unlock_cluster "$cluster_name" "$PLAYPEN_ROOT" exit 3 ;; esac + echo "$id: removing publish lock for $cluster_name." + publish_unlock_cluster "$cluster_name" "$PLAYPEN_ROOT" || { + echo "$id: WARNING Failed to remove publish lock for $cluster!." + } # hurrah! test "x$spawned_ssh_agent" = "x1" && kill $SSH_AGENT_PID |
From: fess <fe...@us...> - 2004-02-26 22:50:28
|
Update of /cvsroot/wigwam/wigwam-base In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15851 Modified Files: ChangeLog Log Message: Index: ChangeLog =================================================================== RCS file: /cvsroot/wigwam/wigwam-base/ChangeLog,v retrieving revision 1.151 retrieving revision 1.152 diff -u -r1.151 -r1.152 --- ChangeLog 26 Feb 2004 22:31:11 -0000 1.151 +++ ChangeLog 26 Feb 2004 22:34:23 -0000 1.152 @@ -4,7 +4,9 @@ when running get-latest-tag. (fess) * print the current directory when 'pubtool tag'ing (fess) * bug fix: make-setup-env did not work for csh shells - if --pid argument was not used. + if --pid argument was not used. (fess/fongd) + * bug fix: diff-playpens, used in publishing, now works properly with + newer versions of perl. (mrad) -- not yet released.. |
From: fess <fe...@us...> - 2004-02-26 22:47:16
|
Update of /cvsroot/wigwam/wigwam-base In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15173 Modified Files: ChangeLog Log Message: oops.. when we try to reexec ourselves to get the ppid, we should not have shift'd away our arguments. Index: ChangeLog =================================================================== RCS file: /cvsroot/wigwam/wigwam-base/ChangeLog,v retrieving revision 1.150 retrieving revision 1.151 diff -u -r1.150 -r1.151 --- ChangeLog 29 Jan 2004 17:11:37 -0000 1.150 +++ ChangeLog 26 Feb 2004 22:31:11 -0000 1.151 @@ -3,6 +3,10 @@ * bug fix: pubtool publish sometimes gave a broken pipe message when running get-latest-tag. (fess) * print the current directory when 'pubtool tag'ing (fess) + * bug fix: make-setup-env did not work for csh shells + if --pid argument was not used. + + -- not yet released.. wigwam-base (3.1) |
From: fess <fe...@us...> - 2004-02-26 22:47:16
|
Update of /cvsroot/wigwam/wigwam-base/bin-scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15173/bin-scripts Modified Files: make-setup-env Log Message: oops.. when we try to reexec ourselves to get the ppid, we should not have shift'd away our arguments. Index: make-setup-env =================================================================== RCS file: /cvsroot/wigwam/wigwam-base/bin-scripts/make-setup-env,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- make-setup-env 16 Dec 2003 01:43:33 -0000 1.15 +++ make-setup-env 26 Feb 2004 22:31:11 -0000 1.16 @@ -33,6 +33,28 @@ # ;; esac +###################################################################### +## If --pid is not given and WIGWAM_INTERACTIVE_PID is not set +## then we exec the pid setter and tell it to recall this script. +## we have to do this now while "$@" is still in tact. +## before we do 'shift' durring argument processing +## sometime after --pid is in setup-env then we can remove +## this section which will make --pid a required argument. + +# first check for --pid +case "$*" in + *--pid' '*|*--pid=*) + # we have a pid arg. don't worry about things yet. + ;; + *) + if test "x$WIGWAM_INTERACTIVE_PID" = "x" ; then + # TODO maybe set exec loop breaker logic here. + exec "$PLAYPEN_ROOT/ext/bin/wigwam-set-ppid" "$0" "$@" + fi + ;; +esac +###################################################################### + do_unset=0 # Figure out what kind of shell the target script will be @@ -144,13 +166,9 @@ if test "x$WIGWAM_INTERACTIVE_PID" = "x" ; then if test "x$ARG_PID" = "x" ; then - - # TODO maybe set exec loop breaker logic here. - exec "$PLAYPEN_ROOT/ext/bin/wigwam-set-ppid" "$0" "$@" - - #echo "$0 was called wrong: '--pid \$\$' is a required argument." 1>&2 - #echo "setup-env probably needs updating. [packagectl update-local]" 1>&2 - #exit 1; + echo "$0 was called wrong: '--pid \$\$' is a required argument." 1>&2 + echo "setup-env probably needs updating. [packagectl update-local]" 1>&2 + exit 1; fi # WIGWAM_INTERACTIVE_PID was not avaialable in the env, then remove any saved # states for $ARG_PID because presumably this is the first pass, so they must |
From: Michael R. <mr...@us...> - 2004-02-14 01:25:26
|
Update of /cvsroot/wigwam/wigwam-base/publish-scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25171 Modified Files: diff-playpens.in Log Message: Always open in binary mode when comparing files (newer perls may try to do unicode translation otherwise). Index: diff-playpens.in =================================================================== RCS file: /cvsroot/wigwam/wigwam-base/publish-scripts/diff-playpens.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- diff-playpens.in 8 Jun 2003 18:47:49 -0000 1.4 +++ diff-playpens.in 14 Feb 2004 01:19:21 -0000 1.5 @@ -18,7 +18,9 @@ { my ($f1, $f2) = @_; open FD1, "<$f1" or die; + binmode (FD1) or die; open FD2, "<$f2" or die; + binmode (FD2) or die; my $s1; my $s2; for (;;) { |
From: Paul M. <wa...@us...> - 2004-01-31 05:10:27
|
Update of /cvsroot/wigwam/wigwam-base/bootstrap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27415 Modified Files: wigwam-bootstrap.in Log Message: make leading whitespace optional in uwget Index: wigwam-bootstrap.in =================================================================== RCS file: /cvsroot/wigwam/wigwam-base/bootstrap/wigwam-bootstrap.in,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- wigwam-bootstrap.in 29 Jan 2004 17:00:25 -0000 1.51 +++ wigwam-bootstrap.in 29 Jan 2004 17:32:35 -0000 1.52 @@ -1173,7 +1173,7 @@ { my ($url) = @_; - $url =~ m#^\s+http://([^/:]+)(:(\d+))?(/(.+)?)?$# or die "bad url $url"; + $url =~ m#^\s*http://([^/:]+)(:(\d+))?(/(.+)?)?$# or die "bad url $url"; my $host = $1; my $port = $3 || 80; @@ -1192,7 +1192,7 @@ { my ($url) = @_; - $url =~ m#^\s+(http|ftp)://([^/:]+)(:(\d+))?(/(.+))?$# or die "bad url $url"; + $url =~ m#^\s*(http|ftp)://([^/:]+)(:(\d+))?(/(.+))?$# or die "bad url $url"; my $method = $1; my $host = $2; |
From: fess <fe...@us...> - 2004-01-31 05:00:10
|
Update of /cvsroot/wigwam/wigwam-base In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22364 Modified Files: ChangeLog Log Message: print directory to tag, just to avoid confusion, when folks might have PLAYPEN root set to a project they weren't expecting. Index: ChangeLog =================================================================== RCS file: /cvsroot/wigwam/wigwam-base/ChangeLog,v retrieving revision 1.149 retrieving revision 1.150 diff -u -r1.149 -r1.150 --- ChangeLog 27 Jan 2004 16:46:50 -0000 1.149 +++ ChangeLog 29 Jan 2004 17:11:37 -0000 1.150 @@ -2,6 +2,7 @@ * bug fix: pubtool publish sometimes gave a broken pipe message when running get-latest-tag. (fess) + * print the current directory when 'pubtool tag'ing (fess) wigwam-base (3.1) |
From: fess <fe...@us...> - 2004-01-30 21:43:27
|
Update of /cvsroot/wigwam/wigwam-base/bin-scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22364/bin-scripts Modified Files: pubtool Log Message: print directory to tag, just to avoid confusion, when folks might have PLAYPEN root set to a project they weren't expecting. Index: pubtool =================================================================== RCS file: /cvsroot/wigwam/wigwam-base/bin-scripts/pubtool,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- pubtool 17 Oct 2003 23:24:38 -0000 1.17 +++ pubtool 29 Jan 2004 17:11:37 -0000 1.18 @@ -489,6 +489,7 @@ # \__\__,_\__, | # |___/ # Tag current state of project for publishing. + echo "In directory `pwd`:" confirm "cvs tag $tag" cvs tag "$tag" test "$?" = 0 || { |
From: Paul M. <wa...@us...> - 2004-01-30 19:06:22
|
Update of /cvsroot/wigwam/wigwam-base/bootstrap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19977 Modified Files: wigwam-bootstrap.in Log Message: strip leading space for url (happens sometimes in Location: headers) Index: wigwam-bootstrap.in =================================================================== RCS file: /cvsroot/wigwam/wigwam-base/bootstrap/wigwam-bootstrap.in,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- wigwam-bootstrap.in 15 Jan 2004 00:56:06 -0000 1.50 +++ wigwam-bootstrap.in 29 Jan 2004 17:00:25 -0000 1.51 @@ -1173,7 +1173,7 @@ { my ($url) = @_; - $url =~ m#^http://([^/:]+)(:(\d+))?(/(.+)?)?$# or die "bad url $url"; + $url =~ m#^\s+http://([^/:]+)(:(\d+))?(/(.+)?)?$# or die "bad url $url"; my $host = $1; my $port = $3 || 80; @@ -1192,7 +1192,7 @@ { my ($url) = @_; - $url =~ m#^(http|ftp)://([^/:]+)(:(\d+))?(/(.+))?$# or die "bad url $url"; + $url =~ m#^\s+(http|ftp)://([^/:]+)(:(\d+))?(/(.+))?$# or die "bad url $url"; my $method = $1; my $host = $2; |