tags 306869 + upstream patch
forwarded 306869 [EMAIL PROTECTED]
thanks
--- Begin Message ---
Package: patchutils
Version: 0.2.30-1
Severity: normal
splitdiff calls lsdiff internally, and when used with the -p option, always
yields this warning:
$ splitdiff -a -d -p1 mypatch
-p given without -i or -x; guessing that you meant --strip instead.
Wrote >foo
Wrote >bar
The warning will clearly confuse the user, since splitdiff has none of the
mentioned "-i", "-x", or "--strip" options.
The problem is that the "-p" given to splitdiff (used when you want to strip
components from the output filenames) should be passed to lsdiff as the
"--strip" option. Following is a minimal fix. In addition, the splitdiff
"-p" should probably be renamed to "--strip" to be consistent with the other
tools.
--- /usr/bin/splitdiff 2004-07-23 14:05:56.000000000 -0400
+++ splitdiff 2005-04-28 18:16:27.000000000 -0400
@@ -64,7 +64,7 @@
die "usage: splitdiff DIFF\n";
}
$getlist = 'lsdiff -n ';
-$getlist .= '-p'.$opts{p}.' ' if ($opts{p});
+$getlist .= '--strip='.$opts{p}.' ' if ($opts{p});
$getlist .= $ARGV[0]; # Yuck. How do you do this properly in perl?
open(LIST, '-|', $getlist) or die "Can't run lsdiff";
@list = <LIST>;
--- End Message ---
