Navigation

Changeset 2139

Timestamp:

12/06/03 18:12:03 (5 years ago)

Author:

khali

Message:

Do not generate empty diffs.

Try to preserve files mtime.

Files:

r2078	r2139
33	33	{
34	34	my ($package_root,$kernel_root,$kernel_file,$package_file) = @_;
35		my ($diff_command,$~~dummy~~);
	35	my ($diff_command,$package_mtime,$kernel_mtime);
36	36
37	37	$diff_command = "diff -u";
38	38	if ( -e "$kernel_root/$kernel_file") {
39		$diff_command .= " $kernel_root/$kernel_file ";
	39	$diff_command .= " $kernel_root/$kernel_file";
	40	$kernel_mtime = (stat("$kernel_root/$kernel_file"))[9];
40	41	} else {
41		$diff_command .= " /dev/null ";
	42	$diff_command .= " /dev/null";
	43	$kernel_mtime = 0;
42	44	}
43	45	if ( -e "$package_root/$package_file") {
44		$diff_command .= " $package_root/$package_file ";
	46	$diff_command .= " $package_root/$package_file";
	47	$package_mtime = (stat("$package_root/$package_file"))[9];
45	48	} else {
46	49	$diff_command .= " /dev/null";
	50	$package_mtime = 0;
47	51	}
48	52	open INPUT, "$diff_command\|" or die "Can't execute `$diff_command'";
49		$dummy = <INPUT>;
50		$dummy = <INPUT>;
51		print "--- linux-old/$kernel_file\t".`date`;
52		print "+++ linux/$kernel_file\t".`date`;
53
54		while (<INPUT>) {
55		print;
	53	if (<INPUT>) {
	54	<INPUT>;
	55	print "--- linux-old/$kernel_file\t".gmtime($kernel_mtime)."\n".
	56	"+++ linux/$kernel_file\t".gmtime($package_mtime)."\n";
	57
	58	print while <INPUT>;
56	59	}
57	60	close INPUT;