[PATCH] P4 Source errors

--/3yNEOqWowh/8j+e
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

----------------------------------------------------------------------
r1115:  clkao | 2004-04-18T17:11:32.004854Z

* Allow p4 client result 'not changed', for do multiple conversion
  in a same test.

* Recognize the non-fatal error in p4 labels when a file is not found.
  This happens when trying to mirror the revml depot.

----------------------------------------------------------------------
--- local/lib/VCP/Source/p4.pm  (revision 1114)
+++ local/lib/VCP/Source/p4.pm  (revision 1115)
@@ -781,8 +781,9 @@ sub load_p4_labels {
             next ;
          }
          next if $spec =3D~ m{^error: //\.\.\.\@.+ file(\(s\))?( not in la=
bel.)?$} ;
+         next if $spec =3D~ m{^error: //\.\.\..+ - no such file\(s\)\.};
          $spec =3D~ /^.*?: *(\/\/.*#\d+)/
-            or die "Couldn't parse name & rev from '$spec' in p4 output:\n=
$files\n" ;
+            or die "Couldn't parse name & rev from '$spec' in p4 output:\n=
$files\n";
          my $id =3D $1;
=20
          debug "p4 label '$label' =3D> '$id'" if debugging ;
--- local/lib/VCP/Utils/p4.pm  (revision 1114)
+++ local/lib/VCP/Utils/p4.pm  (revision 1115)
@@ -830,7 +830,7 @@ sub p4_set_client_spec {
    $self->p4( [ "client", "-i" ], \$client_spec, \my $out ) ;
=20
    die "unexpected stdout from p4:\np4: ", $out
-      unless $out =3D~ /^Client\s.*\ssaved\./ ;
+      unless $out =3D~ /^Client\s.*\s(saved|.*not changed)\./ ;
 }
=20
 =3Ditem split_repo_server

--/3yNEOqWowh/8j+e
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (FreeBSD)

iD8DBQFAgsI9k1XldlEkA5YRAo9YAJ9mjrhrSIwX+wZhFTppQ4czEohMzgCeMFMQ
o9KEdfrQ2P/8P1Zt//CKvmM=
=KeoR
-----END PGP SIGNATURE-----

--/3yNEOqWowh/8j+e--