X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Porting%2Fapply;h=cfa76e0ac19aeb411761b71e9e015dcc0904dbfd;hb=809e8e66a971d59a948ca995e08b228927d82c66;hp=d3bdb0bd70de67b416ccce011fbc7097f6ec64af;hpb=54f3bd6bfff108b3d388b542cab121e33bfdea6a;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/Porting/apply b/Porting/apply
index d3bdb0b..cfa76e0 100644
--- a/Porting/apply
+++ b/Porting/apply
@@ -1,8 +1,8 @@
 #!/usr/bin/perl -w
 my $file = pop(@ARGV);
 my %meta;
-$ENV{'P4PORT'} = 'bactrian:1667';
-$ENV{'P4CLIENT'} = 'ni-s';
+$ENV{'P4PORT'} ||= 'bactrian:1667';
+$ENV{'P4CLIENT'} ||= 'ni-s';
 open(FILE,$file) || die "Cannot open $file:$!";
 while (<FILE>)
  {
@@ -17,7 +17,7 @@ my $code = $?;
 warn "$code from patch\n";
 foreach (@results)
  {
-  if (/patching\s+file\s*(.*?)\s*$/)
+  if (/[Pp]atching\s+file\s*(\S+)/)
    {
     push(@edit,$1);
    }