Author: jsuchome Date: Fri Apr 30 13:44:15 2010 New Revision: 61935 URL: http://svn.opensuse.org/viewcvs/yast?rev=61935&view=rev Log: - ag_anyxml: do not die on broken XML (bnc#600928) - 2.19.13 Modified: trunk/yast2/VERSION trunk/yast2/library/agents/ag_anyxml trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=61935&r1=61934&r2=61935&view=diff ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Fri Apr 30 13:44:15 2010 @@ -1 +1 @@ -2.19.12 +2.19.13 Modified: trunk/yast2/library/agents/ag_anyxml URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/agents/ag_anyxml?rev=61935&r1=61934&r2=61935&view=diff ============================================================================== --- trunk/yast2/library/agents/ag_anyxml (original) +++ trunk/yast2/library/agents/ag_anyxml Fri Apr 30 13:44:15 2010 @@ -78,9 +78,14 @@ } my $xml = new XML::Simple (%in_args); - my $root = $xml->XMLin ($file); + my $root = eval { $xml->XMLin ($file) }; undef $xml; + if($@) { + y2error ("error while parsing file $file"); + undef $root; + } + ycp::Return ($root, 1); # pass everything as string (bnc#409491) } elsif ($command eq "Write") { Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=61935&r1=61934&r2=61935&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Fri Apr 30 13:44:15 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Apr 30 13:32:22 CEST 2010 - jsuchome@suse.cz + +- ag_anyxml: do not die on broken XML (bnc#600928) +- 2.19.13 + +------------------------------------------------------------------- Thu Apr 29 12:15:50 CEST 2010 - jsrain@suse.cz - fixed typo (bnc#594384) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org