loncom/build/lpml_parse.pl - diff

Return to lpml_parse.pl CVS log

Up to [LON-CAPA] / loncom / build

Diff for /loncom/build/lpml_parse.pl between versions 1.61 and 1.62

version 1.61, 2014/06/09 05:14:12	version 1.62, 2020/10/07 19:55:39
Line 1324 END	Line 1324 END
}	}
return $result;	return $result;
}	}
	my $testtarget = $target;
	if ($categoryname eq 'setuid script') {
	my ($path,$filename) = ($target =~ /^(.*\/)([^\/]+)$/);
	my $alttarget = $path.'.'.$filename;
	if ((-e "$targetroot/$target") && (-B "$targetroot/$target") &&
	(-e "$targetroot/$alttarget") && (-T "$targetroot/$alttarget")) {
	$testtarget = $alttarget;
	}
	}
my $bflag='-b5';	my $bflag='-b5';
$bflag='-b3' if ($buildlink);	$bflag='-b3' if ($buildlink);
$bflag='-b6' if (($dependencies) or	$bflag='-b6' if (($dependencies) or
Line 1332 END	Line 1341 END
return <<END;	return <<END;
$buildtest \@if (test -e "${sourceroot}/${source}") && (test -e "${targetroot}/${target}"); then \\	$buildtest \@if (test -e "${sourceroot}/${source}") && (test -e "${targetroot}/${target}"); then \\
ECODE=0; \\	ECODE=0; \\
perl filecompare.pl $bflag ${sourceroot}/${source} ${targetroot}/${target} \|\| ECODE=\$\$?; \\	perl filecompare.pl $bflag ${sourceroot}/${source} ${targetroot}/${testtarget} \|\| ECODE=\$\$?; \\
case "\$\$ECODE" in \\	case "\$\$ECODE" in \\
1) echo "${targetroot}/${target} is unchanged";; \\	1) echo "${targetroot}/${target} is unchanged";; \\
2) echo "** WARNING ** target file ${targetroot}/${target} is newer than CVS source; saving current (old) target file to ${targetroot}/${target}.lpmlsave and then overwriting"$logcmd && install -o www -g www -m 0600 ${targetroot}/${target} ${targetroot}/${target}.lpmlsave && install -p $categoryhash{$categoryname} ${sourceroot}/${source} ${targetroot}/${target};; \\	2) echo "** WARNING ** target file ${targetroot}/${target} is newer than CVS source; saving current (old) target file to ${targetroot}/${target}.lpmlsave and then overwriting"$logcmd && install -o www -g www -m 0600 ${targetroot}/${target} ${targetroot}/${target}.lpmlsave && install -p $categoryhash{$categoryname} ${sourceroot}/${source} ${targetroot}/${target};; \\
Line 1356 $buildtest \@if !(test -e "${sourceroot}	Line 1365 $buildtest \@if !(test -e "${sourceroot}
echo "install -p $categoryhash{$categoryname} ${sourceroot}/${source} ${targetroot}/${target}" && install -p $categoryhash{$categoryname} ${sourceroot}/${source} ${targetroot}/${target}; \\	echo "install -p $categoryhash{$categoryname} ${sourceroot}/${source} ${targetroot}/${target}" && install -p $categoryhash{$categoryname} ${sourceroot}/${source} ${targetroot}/${target}; \\
else \\	else \\
ECODE=0; \\	ECODE=0; \\
perl filecompare.pl $bflag ${sourceroot}/${source} ${targetroot}/${target} \|\| ECODE=\$\$?; \\	perl filecompare.pl $bflag ${sourceroot}/${source} ${targetroot}/${testtarget} \|\| ECODE=\$\$?; \\
case "\$\$ECODE" in \\	case "\$\$ECODE" in \\
1) echo "${targetroot}/${target} is unchanged";; \\	1) echo "${targetroot}/${target} is unchanged";; \\
2) echo "** WARNING ** target file ${targetroot}/${target} is newer than CVS source; saving current (old) target file to ${targetroot}/${target}.lpmlsave and then overwriting"$logcmd && install -o www -g www -m 0600 ${targetroot}/${target} ${targetroot}/${target}.lpmlsave && install -p $categoryhash{$categoryname} ${sourceroot}/${source} ${targetroot}/${target};; \\	2) echo "** WARNING ** target file ${targetroot}/${target} is newer than CVS source; saving current (old) target file to ${targetroot}/${target}.lpmlsave and then overwriting"$logcmd && install -o www -g www -m 0600 ${targetroot}/${target} ${targetroot}/${target}.lpmlsave && install -p $categoryhash{$categoryname} ${sourceroot}/${source} ${targetroot}/${target};; \\

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.61
changed lines
	Added in v.1.62