Author: mvidner Date: Mon Apr 7 13:24:16 2008 New Revision: 46176 URL: http://svn.opensuse.org/viewcvs/yast?rev=46176&view=rev Log: Merged revisions 43137-46174 via svnmerge from http://svn.opensuse.org/svn/yast/branches/SuSE-SLE-10-SP1-Branch/core ........ r43668 | mvidner | 2008-01-16 15:51:37 +0100 (St, 16 led 2008) | 3 lines any-agent: added Omit, a write-nothing companion to Optional, necessary for an fstab truncation fix (#351648) ........ r44541 | mvidner | 2008-02-15 16:50:51 +0100 (Pá, 15 úno 2008) | 2 lines Fixed an omission in the implementation of Omit (bnc#351648). ........ Modified: branches/SuSE-SLE-10-SP2-Branch/core/ (props changed) branches/SuSE-SLE-10-SP2-Branch/core/VERSION branches/SuSE-SLE-10-SP2-Branch/core/agent-any/doc/anyagent.html branches/SuSE-SLE-10-SP2-Branch/core/agent-any/src/AnyAgentComplex.cc branches/SuSE-SLE-10-SP2-Branch/core/agent-any/testsuite/tests/etc_fstab.err branches/SuSE-SLE-10-SP2-Branch/core/agent-any/testsuite/tests/etc_fstab.in branches/SuSE-SLE-10-SP2-Branch/core/agent-any/testsuite/tests/etc_fstab.out branches/SuSE-SLE-10-SP2-Branch/core/agent-any/testsuite/tests/etc_fstab.scr branches/SuSE-SLE-10-SP2-Branch/core/agent-any/testsuite/tests/etc_fstab.ycp branches/SuSE-SLE-10-SP2-Branch/core/package/yast2-core.changes Modified: branches/SuSE-SLE-10-SP2-Branch/core/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/core/VERSION?rev=46176&r1=46175&r2=46176&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/core/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/core/VERSION Mon Apr 7 13:24:16 2008 @@ -1 +1 @@ -2.13.42 +2.13.43 Modified: branches/SuSE-SLE-10-SP2-Branch/core/agent-any/doc/anyagent.html URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/core/agent-any/doc/anyagent.html?rev=46176&r1=46175&r2=46176&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/core/agent-any/doc/anyagent.html (original) +++ branches/SuSE-SLE-10-SP2-Branch/core/agent-any/doc/anyagent.html Mon Apr 7 13:24:16 2008 @@ -139,6 +139,7 @@ <a href="#Match">Match</a> <a href="#Name">Name</a> <a href="#Number">Number</a> +<a href="#Omit">Omit</a> <a href="#Optional">Optional</a> <a href="#Or">Or</a> <a href="#Separator">Separator</a> @@ -169,6 +170,7 @@ <a href="#List">List</a> <a href="#Match">Match</a> <a href="#Name">Name</a> +<a href="#Omit">Omit</a> <a href="#Optional">Optional</a> <a href="#Or">Or</a> <a href="#Separator">Separator</a> @@ -453,6 +455,26 @@ <!--================================================================--> <hr> +<h3 id="Omit">Omit</h3> + +<p>Omit ( <i>syntax</i> ) + +<dl> +<dt>Read: +<dd>Matches <i>syntax</i>, optionally. + +<dt>Write: +<dd>Writes nothing. + +<dt>See also: +<dd><a href="#Optional">Optional</a> + +<dt>Examples: +<dd> +</dl> + +<!--================================================================--> +<hr> <h3 id="Optional">Optional</h3> <p>Optional ( <i>syntax</i> ) @@ -465,7 +487,7 @@ <dd>Writes <i>syntax</i>, always. <dt>See also: -<dd> +<dd><a href="#Omit">Omit</a> <dt>Examples: <dd> Modified: branches/SuSE-SLE-10-SP2-Branch/core/agent-any/src/AnyAgentComplex.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/core/agent-any/src/AnyAgentComplex.cc?rev=46176&r1=46175&r2=46176&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/core/agent-any/src/AnyAgentComplex.cc (original) +++ branches/SuSE-SLE-10-SP2-Branch/core/agent-any/src/AnyAgentComplex.cc Mon Apr 7 13:24:16 2008 @@ -411,6 +411,7 @@ YCPTerm term = element->asTerm (); if (!(term.isNull ()) && ((term->name () == "Skip") || + (term->name () == "Omit") || (term->name () == "Fillup"))) continue; } @@ -448,8 +449,9 @@ y2debug ("YT_TERM (%s)", s.c_str ()); // Optional + // Omit, #351648 - if (s == "Optional" && term->size () > 0) + if ((s == "Optional" || s == "Omit") && term->size () > 0) { YCPValue ov = parseData (line, term->value (0), true); if (ov.isNull ()) @@ -738,6 +740,13 @@ return unparseData (term->value (0), value); } + // Omit + + if (s == "Omit" && term->size () > 0) + { + return ""; + } + // Continue else if (s == "Continue" && term->size () > 0) Modified: branches/SuSE-SLE-10-SP2-Branch/core/agent-any/testsuite/tests/etc_fstab.err URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/core/agent-any/testsuite/tests/etc_fstab.err?rev=46176&r1=46175&r2=46176&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/core/agent-any/testsuite/tests/etc_fstab.err (original) +++ branches/SuSE-SLE-10-SP2-Branch/core/agent-any/testsuite/tests/etc_fstab.err Mon Apr 7 13:24:16 2008 @@ -0,0 +1,4 @@ +[agent-any] AnyAgentComplex.cc(unparseData):936 No value for key 'freq' in map +[agent-any] AnyAgentComplex.cc(unparseData):936 No value for key 'freq' in map +[agent-any] AnyAgentComplex.cc(unparseData):936 No value for key 'freq' in map +[agent-any] AnyAgentComplex.cc(unparseData):936 No value for key 'freq' in map Modified: branches/SuSE-SLE-10-SP2-Branch/core/agent-any/testsuite/tests/etc_fstab.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/core/agent-any/testsuite/tests/etc_fstab.in?rev=46176&r1=46175&r2=46176&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/core/agent-any/testsuite/tests/etc_fstab.in (original) +++ branches/SuSE-SLE-10-SP2-Branch/core/agent-any/testsuite/tests/etc_fstab.in Mon Apr 7 13:24:16 2008 @@ -2,7 +2,7 @@ /dev/sda1 / ext2 defaults 1 1 /dev/sda3 /usr reiserfs defaults 1 2 -/dev/scd0 /cdrom iso9660 ro,noauto,user 0 0 + /dev/scd0 /cdrom iso9660 ro,noauto,user 0 0 /dev/fd0 /floppy auto noauto,user 0 0 wotan:/real-home /home/dhs nfs rw,hard,bg,intr,rsize=8192,wsize=8192 Modified: branches/SuSE-SLE-10-SP2-Branch/core/agent-any/testsuite/tests/etc_fstab.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/core/agent-any/testsuite/tests/etc_fstab.out?rev=46176&r1=46175&r2=46176&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/core/agent-any/testsuite/tests/etc_fstab.out (original) +++ branches/SuSE-SLE-10-SP2-Branch/core/agent-any/testsuite/tests/etc_fstab.out Mon Apr 7 13:24:16 2008 @@ -1 +1 @@ -([$["file":"swap", "freq":0, "mntops":"defaults", "passno":0, "spec":"/dev/sda2", "vfstype":"swap"], $["file":"/", "freq":1, "mntops":"defaults", "passno":1, "spec":"/dev/sda1", "vfstype":"ext2"], $["file":"/usr", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/sda3", "vfstype":"reiserfs"], $["file":"/cdrom", "freq":0, "mntops":"ro,noauto,user", "passno":0, "spec":"/dev/scd0", "vfstype":"iso9660"], $["file":"/floppy", "freq":0, "mntops":"noauto,user", "passno":0, "spec":"/dev/fd0", "vfstype":"auto"], $["file":"/home/dhs", "mntops":"rw,hard,bg,intr,rsize=8192,wsize=8192", "spec":"wotan:/real-home", "vfstype":"nfs"], $["file":"/home/alex", "mntops":"rw,hard,bg,intr,rsize=8192,wsize=8192", "spec":"galois:/real-home", "vfstype":"nfs"], $["file":"/mirror", "mntops":"rw,intr,noauto,user,exec,rsize=8192,wsize=819:", "spec":"euklid:/mirror", "vfstype":"nfs"], $["file":"/schnell", "mntops":"rw,intr,noauto,user,exec,rsize=8192,wsize=819:", "spec":"schnell:/cdrom", "vfstype":"nfs"], $["file":"/proc", "freq":0, "mntops":"defaults", "passno":0, "spec":"none", "vfstype":"proc"]]) +([[$["file":"swap", "freq":0, "mntops":"defaults", "passno":0, "spec":"/dev/sda2", "vfstype":"swap"], $["file":"/", "freq":1, "mntops":"defaults", "passno":1, "spec":"/dev/sda1", "vfstype":"ext2"], $["file":"/usr", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/sda3", "vfstype":"reiserfs"], $["file":"/cdrom", "freq":0, "mntops":"ro,noauto,user", "passno":0, "spec":"/dev/scd0", "vfstype":"iso9660"], $["file":"/floppy", "freq":0, "mntops":"noauto,user", "passno":0, "spec":"/dev/fd0", "vfstype":"auto"], $["file":"/home/dhs", "mntops":"rw,hard,bg,intr,rsize=8192,wsize=8192", "spec":"wotan:/real-home", "vfstype":"nfs"], $["file":"/home/alex", "mntops":"rw,hard,bg,intr,rsize=8192,wsize=8192", "spec":"galois:/real-home", "vfstype":"nfs"], $["file":"/mirror", "mntops":"rw,intr,noauto,user,exec,rsize=8192,wsize=819:", "spec":"euklid:/mirror", "vfstype":"nfs"], $["file":"/schnell", "mntops":"rw,intr,noauto,user,exec,rsize=8192,wsize=819:", "spec":"schnell:/cdrom", "vfstype":"nfs"], $["file":"/proc", "freq":0, "mntops":"defaults", "passno":0, "spec":"none", "vfstype":"proc"]], true]) Modified: branches/SuSE-SLE-10-SP2-Branch/core/agent-any/testsuite/tests/etc_fstab.scr URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/core/agent-any/testsuite/tests/etc_fstab.scr?rev=46176&r1=46175&r2=46176&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/core/agent-any/testsuite/tests/etc_fstab.scr (original) +++ branches/SuSE-SLE-10-SP2-Branch/core/agent-any/testsuite/tests/etc_fstab.scr Mon Apr 7 13:24:16 2008 @@ -7,6 +7,7 @@ false, // read-only (`List ( `Tuple ( + `Omit(`Whitespace()), // #351648 `spec (`String("^\t ")), `Separator ("\t "), `file (`String("^\t ")), @@ -17,7 +18,8 @@ `Optional(`Whitespace()), `Optional(`freq (`Number())), `Optional(`Whitespace()), - `Optional(`passno (`Number())) + `Optional(`passno (`Number())), + `Omit(`Whitespace()) ), "\n" )) Modified: branches/SuSE-SLE-10-SP2-Branch/core/agent-any/testsuite/tests/etc_fstab.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/core/agent-any/testsuite/tests/etc_fstab.ycp?rev=46176&r1=46175&r2=46176&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/core/agent-any/testsuite/tests/etc_fstab.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/core/agent-any/testsuite/tests/etc_fstab.ycp Mon Apr 7 13:24:16 2008 @@ -1,3 +1,5 @@ { - return (SCR::Read (.)); + any r = SCR::Read (.); + any w = SCR::Write(., r); + return [r, w]; } Modified: branches/SuSE-SLE-10-SP2-Branch/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/core/package/yast2-core.changes?rev=46176&r1=46175&r2=46176&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/core/package/yast2-core.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/core/package/yast2-core.changes Mon Apr 7 13:24:16 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Apr 7 13:14:10 CEST 2008 - mvidner@suse.cz + +- any-agent: added Omit, a write-nothing companion to Optional, + necessary for an fstab truncation fix (bnc#351648) +- Fixed an omission in the implementation of Omit (bnc#351648). +- 2.13.43 + +------------------------------------------------------------------- Tue Dec 11 14:19:34 CET 2007 - mvidner@suse.cz - Enabled iterating over all functions of a Y2Namespace, for -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org