From: Gurusamy Sarathy <gsar@cpan.org>
Date: Wed, 8 May 2002 13:33:41 +0000 (+0000)
Subject: fix p4genpatch breakage (missing slash in patch headers)
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=38dcbcb14692b63ada408034166cbddc5f2e25ad;p=p5sagit%2Fp5-mst-13.2.git

fix p4genpatch breakage (missing slash in patch headers)

p4raw-id: //depot/perl@16489
---

diff --git a/Porting/p4genpatch b/Porting/p4genpatch
index 5c55d38..e2350b0 100644
--- a/Porting/p4genpatch
+++ b/Porting/p4genpatch
@@ -95,7 +95,7 @@ for my $a (@action) {
   } else {
     die "Unknown action[$action]";
   }
-  $d2 = "$path$basename";
+  $d2 = File::Spec->catfile($path, $basename);
   $t2 = File::Spec->catfile($tempdir, $d2);
   warn "==> $d2#$number <==\n" if $OPT{v};
   my $system = qq[p4 @P4opt print -o "$t2" "$file"];
@@ -113,7 +113,7 @@ for my $a (@action) {
     unless ($type =~ /text/) {
       next;
     }
-    print "Index: $path$basename\n";
+    print "Index: $d2\n";
     correctmtime($prevfile,$prev,$t1) unless $doadd;
     correctmtime($file,$number,$t2);
     chdir $tempdir or warn "Could not chdir '$tempdir': $!";