--- loncom/build/lpml_parse.pl 2002/05/19 17:46:19 1.48 +++ loncom/build/lpml_parse.pl 2002/05/23 19:24:33 1.50 @@ -12,7 +12,7 @@ # The LearningOnline Network with CAPA # lpml_parse.pl - Linux Packaging Markup Language parser # -# $Id: lpml_parse.pl,v 1.48 2002/05/19 17:46:19 harris41 Exp $ +# $Id: lpml_parse.pl,v 1.50 2002/05/23 19:24:33 harris41 Exp $ # # Written by Scott Harrison, codeharrison@yahoo.com # @@ -1283,9 +1283,9 @@ END ' && echo "**** NOTE: CONFIGURATION FILE CHANGE ****"'. " \\\n\t\t".$logcmd.' && '." \\\n\t\t"."echo -n \"". 'You likely need to compare contents of "'."\\\n\t\t\t". - 'echo -n "'.$targetroot.'/'.$target.'"'."\\\n\t\t". - 'echo -n "with the new "'."\\\n\t\t\t". - 'echo "'.$targetroot.'/'.$target.'.lpmlnew"'."\\\n\t\t". + '&& echo -n "'.$targetroot.'/'.$target.'"'."\\\n\t\t". + '&& echo -n " with the new "'."\\\n\t\t\t". + '&& echo "'.$targetroot.'/'.$target.'.lpmlnew"'."\\\n\t\t". "$logcmd); } && "." \\\n\t"."\\\n\t"."\\\n\t". @@ -1298,11 +1298,11 @@ END "\\\n\t\t".$logcmd.' && '."\\\n\t\t". 'echo -n "'. 'You likely need to review the contents of "'."\\\n\t\t\t". - 'echo -n "'. + '&& echo -n "'. $targetroot.'/'.$target.'"'."\\\n\t\t\t". - 'echo -n "'. - 'to make sure its "'."\\\n\t\t". - 'echo "'. + '&& echo -n "'. + ' to make sure its "'."\\\n\t\t". + '&& echo "'. 'settings are compatible with your overall system"'."\\\n\t\t". "$logcmd); } && "."\\\n\t"."\\\n\t"."\\\n\t". @@ -1310,7 +1310,7 @@ END '{ [ $$ECODE != "1" ] || ('."\\\n\t\t". 'echo "**** ERROR ****"'.$logcmd.' && '."\\\n\t\t".'echo -n "'. 'Configuration source file does not exist "'."\\\n\t\t". - 'echo -n "'.$sourceroot.'/'.$source.'"'."\\\n\t\t". + '&& echo -n "'.$sourceroot.'/'.$source.'"'."\\\n\t\t". "$logcmd); } && "."\\\n\t\t". "perl verifymodown.pl ${targetroot}/${target} "."\\\n\t\t\t". "\"$categoryhash{$categoryname}\""."\\\n\t\t\t".