Actually, Log::Message::Simple comes from Jos, not Tels.

[perl5.git] / Porting / apply

diff --git a/Porting/apply b/Porting/apply
index a0b01cc..cfa76e0 100644 (file)
--- 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'} = 'camel-linux';
+$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);
    }
@@ -52,7 +52,7 @@ else
  {
   if (@edit)
    {
-    System("p4 revert @edit");
+    System("p4 refresh @edit");
    }
  }
 
@@ -69,3 +69,4 @@ sub System
    _exit(exec $cmd);
   }
 }
+