Author: ug Date: Wed Apr 8 12:19:02 2009 New Revision: 56682 URL: http://svn.opensuse.org/viewcvs/yast?rev=56682&view=rev Log: classes and rules RNC files fixed (bnc#493172) Modified: branches/tmp/SLE-11-SP1-Stash/autoinstallation/package/autoyast2.changes branches/tmp/SLE-11-SP1-Stash/autoinstallation/src/schema/classes-use.rnc branches/tmp/SLE-11-SP1-Stash/autoinstallation/src/schema/rules.rnc Modified: branches/tmp/SLE-11-SP1-Stash/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/autoinstallation/package/autoyast2.changes?rev=56682&r1=56681&r2=56682&view=diff ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/autoinstallation/package/autoyast2.changes (original) +++ branches/tmp/SLE-11-SP1-Stash/autoinstallation/package/autoyast2.changes Wed Apr 8 12:19:02 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Apr 8 12:19:03 CEST 2009 - ug@suse.de + +- classes and rules RNC files fixed (bnc#493172) + +------------------------------------------------------------------- Tue Mar 31 14:54:59 CEST 2009 - ug@suse.de - default filesystem changed to ext3 (bnc#490389) Modified: branches/tmp/SLE-11-SP1-Stash/autoinstallation/src/schema/classes-use.rnc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/autoinstallation/src/schema/classes-use.rnc?rev=56682&r1=56681&r2=56682&view=diff ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/autoinstallation/src/schema/classes-use.rnc (original) +++ branches/tmp/SLE-11-SP1-Stash/autoinstallation/src/schema/classes-use.rnc Wed Apr 8 12:19:02 2009 @@ -15,7 +15,11 @@ class = element class { class_name & - configuration + configuration & + element dont_merge { + LIST, + element element { text }* + }? } class_name = Modified: branches/tmp/SLE-11-SP1-Stash/autoinstallation/src/schema/rules.rnc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/autoinstallation/src/schema/rules.rnc?rev=56682&r1=56681&r2=56682&view=diff ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/autoinstallation/src/schema/rules.rnc (original) +++ branches/tmp/SLE-11-SP1-Stash/autoinstallation/src/schema/rules.rnc Wed Apr 8 12:19:02 2009 @@ -89,6 +89,10 @@ result = element result { profile & + element dont_merge { + LIST, + element element { text }* + }? & continue? } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org