Author: jsuchome Date: Mon Nov 21 15:29:37 2011 New Revision: 66886 URL: http://svn.opensuse.org/viewcvs/yast?rev=66886&view=rev Log: - there might be other configs than 'root' (bnc#731687) - 2.22.1 Added: trunk/snapper/testsuite/tests/ReadConfigs.err trunk/snapper/testsuite/tests/ReadConfigs.out trunk/snapper/testsuite/tests/ReadConfigs.ycp (with props) Modified: trunk/snapper/VERSION trunk/snapper/package/yast2-snapper.changes trunk/snapper/src/Snapper.ycp Modified: trunk/snapper/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/VERSION?rev=66886&r1=66885&r2=66886&view=diff ============================================================================== --- trunk/snapper/VERSION (original) +++ trunk/snapper/VERSION Mon Nov 21 15:29:37 2011 @@ -1 +1 @@ -2.22.0 +2.22.1 Modified: trunk/snapper/package/yast2-snapper.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/package/yast2-snapper.changes?rev=66886&r1=66885&r2=66886&view=diff ============================================================================== --- trunk/snapper/package/yast2-snapper.changes (original) +++ trunk/snapper/package/yast2-snapper.changes Mon Nov 21 15:29:37 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Nov 21 14:56:44 CET 2011 - jsuchome@suse.cz + +- there might be other configs than 'root' (bnc#731687) +- 2.22.1 + +------------------------------------------------------------------- Wed Nov 16 11:20:22 CET 2011 - jsuchome@suse.cz - merged texts from proofreading Modified: trunk/snapper/src/Snapper.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/src/Snapper.ycp?rev=66886&r1=66885&r2=66886&view=diff ============================================================================== --- trunk/snapper/src/Snapper.ycp (original) +++ trunk/snapper/src/Snapper.ycp Mon Nov 21 15:29:37 2011 @@ -206,6 +206,10 @@ Report::Error (_("File /etc/sysconfig/snapper is not available.")); configs = [ "root" ]; } + if (!contains (configs, "root") && size (configs) > 0) + { + current_config = configs[0]:"root"; + } return configs; } Added: trunk/snapper/testsuite/tests/ReadConfigs.err URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/testsuite/tests/ReadConfigs.err?rev=66886&view=auto ============================================================================== (empty) Added: trunk/snapper/testsuite/tests/ReadConfigs.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/testsuite/tests/ReadConfigs.out?rev=66886&view=auto ============================================================================== --- trunk/snapper/testsuite/tests/ReadConfigs.out (added) +++ trunk/snapper/testsuite/tests/ReadConfigs.out Mon Nov 21 15:29:37 2011 @@ -0,0 +1,12 @@ +Read .snapper.configs [] +Return [] +Return root +Read .snapper.configs nil +Return ["root"] +Return root +Read .snapper.configs ["opt", "var", "root"] +Return ["opt", "var", "root"] +Return root +Read .snapper.configs ["opt", "var"] +Return ["opt", "var"] +Return opt Added: trunk/snapper/testsuite/tests/ReadConfigs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/testsuite/tests/ReadConfigs.ycp?rev=66886&view=auto ============================================================================== --- trunk/snapper/testsuite/tests/ReadConfigs.ycp (added) +++ trunk/snapper/testsuite/tests/ReadConfigs.ycp Mon Nov 21 15:29:37 2011 @@ -0,0 +1,31 @@ +{ + // testedfiles: Snapper.ycp + + import "Testsuite"; + import "Snapper"; + + map READ = $[ + "snapper" : $[ + "configs" : [] + ] + ]; + + Testsuite::Test (``(Snapper::ReadConfigs ()), [ READ, $[], $[] ], 0); + Testsuite::Test (``(Snapper::current_config), [ READ, $[], $[] ], 0); + + READ["snapper","configs"] = nil; + + Testsuite::Test (``(Snapper::ReadConfigs ()), [ READ, $[], $[] ], 0); + Testsuite::Test (``(Snapper::current_config), [ READ, $[], $[] ], 0); + + READ["snapper","configs"] = [ "opt", "var", "root" ]; + + Testsuite::Test (``(Snapper::ReadConfigs ()), [ READ, $[], $[] ], 0); + Testsuite::Test (``(Snapper::current_config), [ READ, $[], $[] ], 0); + + READ["snapper","configs"] = [ "opt", "var" ]; + + Testsuite::Test (``(Snapper::ReadConfigs ()), [ READ, $[], $[] ], 0); + Testsuite::Test (``(Snapper::current_config), [ READ, $[], $[] ], 0); + +} -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org