[interchange-cvs] interchange - heins modified lib/Vend/Util.pm

interchange-core@icdevgroup.org interchange-core@icdevgroup.org
Sat Jul 20 11:00:01 2002


User:      heins
Date:      2002-07-20 14:59:41 GMT
Modified:  lib/Vend Tag: STABLE_4_8-branch Util.pm
Log:
* Apply patch to fix problem found by Cameron Prince -- messing with javasc=
ript
  callouts in change_url function.

Revision  Changes    Path
No                   revision



No                   revision



2.1.2.10  +4 -3      interchange/lib/Vend/Util.pm


rev 2.1.2.10, prev_rev 2.1.2.9
Index: Util.pm
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /anon_cvs/repository/interchange/lib/Vend/Util.pm,v
retrieving revision 2.1.2.9
retrieving revision 2.1.2.10
diff -u -r2.1.2.9 -r2.1.2.10
--- Util.pm	27 Jun 2002 22:38:24 -0000	2.1.2.9
+++ Util.pm	20 Jul 2002 14:59:41 -0000	2.1.2.10
@@ -1,6 +1,6 @@
 # Vend::Util - Interchange utility functions
 #
-# $Id: Util.pm,v 2.1.2.9 2002/06/27 22:38:24 jon Exp $
+# $Id: Util.pm,v 2.1.2.10 2002/07/20 14:59:41 mheins Exp $
 #=20
 # Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -74,7 +74,7 @@
 use Errno;
 use subs qw(logError logGlobal);
 use vars qw($VERSION @EXPORT @EXPORT_OK);
-$VERSION =3D substr(q$Revision: 2.1.2.9 $, 10);
+$VERSION =3D substr(q$Revision: 2.1.2.10 $, 10);
=20
 BEGIN {
 	eval {
@@ -1136,7 +1136,8 @@
=20
 sub change_url {
 	my $url =3D shift;
-	return $url if $url =3D~ m{^(?:\w+:)?/};
+	return $url if $url =3D~ m{^\w+:};
+	return $url if $url =3D~ m{^/};
 #::logDebug("changed $url");
 	my $arg;
 	my @args;