September 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r65500 - /tags/branch-Code-11-SP2-2_17_110/yast2/
by lslezak＠svn2.opensuse.org 01 Sep '11

01 Sep '11

Author: lslezak Date: Thu Sep 1 14:06:19 2011 New Revision: 65500 URL: http://svn.opensuse.org/viewcvs/yast?rev=65500&view=rev Log: Created tag branch-Code-11-SP2-2_17_110 for yast2 Added: tags/branch-Code-11-SP2-2_17_110/yast2/ (props changed) - copied from r65499, branches/SuSE-Code-11-SP2-Branch/yast2/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r65499 - in /branches/SuSE-Code-11-SP2-Branch/yast2: ./ library/types/src/ library/types/testsuite/tests/ package/
by lslezak＠svn2.opensuse.org 01 Sep '11

01 Sep '11

Author: lslezak Date: Thu Sep 1 14:06:13 2011 New Revision: 65499 URL: http://svn.opensuse.org/viewcvs/yast?rev=65499&view=rev Log: - added String::FindMountPoint() function (moved from yast2-wagon to share it with yast2-packager) - 2.17.110 Added: branches/SuSE-Code-11-SP2-Branch/yast2/library/types/testsuite/tests/FindMountPoint.err branches/SuSE-Code-11-SP2-Branch/yast2/library/types/testsuite/tests/FindMountPoint.out branches/SuSE-Code-11-SP2-Branch/yast2/library/types/testsuite/tests/FindMountPoint.ycp Modified: branches/SuSE-Code-11-SP2-Branch/yast2/VERSION branches/SuSE-Code-11-SP2-Branch/yast2/library/types/src/String.ycp branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes Modified: branches/SuSE-Code-11-SP2-Branch/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/VERSION Thu Sep 1 14:06:13 2011 @@ -1 +1 @@ -2.17.109 +2.17.110 Modified: branches/SuSE-Code-11-SP2-Branch/yast2/library/types/src/String.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/library/types/src/String.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/library/types/src/String.ycp Thu Sep 1 14:06:13 2011 @@ -1250,5 +1250,29 @@ return search(str, test) == 0; } +/* +* Find a mount point for given directory/file path. Returns "/" if no mount point matches +* @param dir requested path , e.g. "/usr/share" +* @param dirs list of mount points, e.g. [ "/", "/usr", "/boot" ] +* @return string a mount point from the input list or "/" if not found +*/ +global string FindMountPoint(string dir, list<string> dirs) +{ + while (dir != nil && dir != "" && !contains(dirs, dir)) + { + // strip the last path component and try it again + list<string> comps = splitstring(dir, "/"); + comps = remove(comps, size(comps) - 1); + dir = mergestring(comps, "/"); + } + + if (dir == nil || dir == "") + { + dir = "/"; + } + + return dir; +} + /* EOF */ } Added: branches/SuSE-Code-11-SP2-Branch/yast2/library/types/testsuite/tests/FindMountPoint.err URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== (empty) Added: branches/SuSE-Code-11-SP2-Branch/yast2/library/types/testsuite/tests/FindMountPoint.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/library/types/testsuite/tests/FindMountPoint.out (added) +++ branches/SuSE-Code-11-SP2-Branch/yast2/library/types/testsuite/tests/FindMountPoint.out Thu Sep 1 14:06:13 2011 @@ -0,0 +1,14 @@ +Dump Test nil +Return / +Return / +Return / +Dump Test empty string +Return / +Return / +Return / +Dump Test valid values +Return / +Return /usr +Return /usr +Return /usr +Return /usr/share Added: branches/SuSE-Code-11-SP2-Branch/yast2/library/types/testsuite/tests/FindMountPoint.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/library/types/testsuite/tests/FindMountPoint.ycp (added) +++ branches/SuSE-Code-11-SP2-Branch/yast2/library/types/testsuite/tests/FindMountPoint.ycp Thu Sep 1 14:06:13 2011 @@ -0,0 +1,24 @@ +{ + +include "testsuite.ycp"; + +import "String"; + +//import "Wagon"; +DUMP("Test nil"); +TEST(``(String::FindMountPoint(nil, nil)), [], nil); +TEST(``(String::FindMountPoint(nil, [])), [], nil); +TEST(``(String::FindMountPoint(nil, ["/boot", "/"])), [], nil); + +DUMP("Test empty string"); +TEST(``(String::FindMountPoint("", nil)), [], nil); +TEST(``(String::FindMountPoint("", [])), [], nil); +TEST(``(String::FindMountPoint("", ["/boot", "/"])), [], nil); + +DUMP("Test valid values"); +TEST(``(String::FindMountPoint("/", ["/boot", "/", "/usr"])), [], nil); +TEST(``(String::FindMountPoint("/usr", ["/boot", "/", "/usr"])), [], nil); +TEST(``(String::FindMountPoint("/usr/", ["/boot", "/", "/usr"])), [], nil); +TEST(``(String::FindMountPoint("/usr/share/locale", ["/boot", "/", "/usr"])), [], nil); +TEST(``(String::FindMountPoint("/usr/share/locale", ["/boot", "/", "/usr", "/usr/share"])), [], nil); +} Modified: branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes Thu Sep 1 14:06:13 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Sep 1 11:33:18 UTC 2011 - lslezak(a)suse.cz + +- added String::FindMountPoint() function (moved from yast2-wagon + to share it with yast2-packager) +- 2.17.110 + +------------------------------------------------------------------- Thu Sep 1 06:40:43 UTC 2011 - jsrain@site - enhanced the help command-line parameters (bnc#712271) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r65498 - /tags/stable-2_21_8/product-creator/
by jsuchome＠svn2.opensuse.org 01 Sep '11

01 Sep '11

Author: jsuchome Date: Thu Sep 1 12:06:00 2011 New Revision: 65498 URL: http://svn.opensuse.org/viewcvs/yast?rev=65498&view=rev Log: Created tag stable-2_21_8 for product-creator Added: tags/stable-2_21_8/product-creator/ - copied from r65497, trunk/product-creator/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r65497 - in /trunk/product-creator: VERSION package/yast2-product-creator.changes src/kiwi_dialogs.ycp
by jsuchome＠svn2.opensuse.org 01 Sep '11

01 Sep '11

Author: jsuchome Date: Thu Sep 1 12:05:53 2011 New Revision: 65497 URL: http://svn.opensuse.org/viewcvs/yast?rev=65497&view=rev Log: - during test for delete conflicts, check for packages selected by YaST (bnc#710733) - 2.21.8 Modified: trunk/product-creator/VERSION trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/kiwi_dialogs.ycp Modified: trunk/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=6549… ============================================================================== --- trunk/product-creator/VERSION (original) +++ trunk/product-creator/VERSION Thu Sep 1 12:05:53 2011 @@ -1 +1 @@ -2.21.7 +2.21.8 Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-pr… ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Thu Sep 1 12:05:53 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Sep 1 12:03:01 CEST 2011 - jsuchome(a)suse.cz + +- during test for delete conflicts, check for packages selected + by YaST (bnc#710733) +- 2.21.8 + +------------------------------------------------------------------- Fri Aug 12 15:24:09 CEST 2011 - jsuchome(a)suse.cz - ignore bootinclude packages during the check what is available Modified: trunk/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi_dialogs… ============================================================================== --- trunk/product-creator/src/kiwi_dialogs.ycp (original) +++ trunk/product-creator/src/kiwi_dialogs.ycp Thu Sep 1 12:05:53 2011 @@ -1267,7 +1267,7 @@ { symbol transact_by = package["transact_by"]:`none; string name = package["name"]:""; - if (transact_by == `solver || transact_by == `user) + if (transact_by == `solver || transact_by == `user || transact_by == `app_high) { if (haskey (to_delete, name)) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r65496 - /tags/stable-2_21_0/add-on-creator/
by jsuchome＠svn2.opensuse.org 01 Sep '11

01 Sep '11

Author: jsuchome Date: Thu Sep 1 12:01:16 2011 New Revision: 65496 URL: http://svn.opensuse.org/viewcvs/yast?rev=65496&view=rev Log: Created tag stable-2_21_0 for add-on-creator Added: tags/stable-2_21_0/add-on-creator/ - copied from r65495, trunk/add-on-creator/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r65495 - in /trunk/add-on-creator: VERSION package/yast2-add-on-creator.changes src/complex.ycp
by jsuchome＠svn2.opensuse.org 01 Sep '11

01 Sep '11

Author: jsuchome Date: Thu Sep 1 12:00:55 2011 New Revision: 65495 URL: http://svn.opensuse.org/viewcvs/yast?rev=65495&view=rev Log: - update products list (bnc#715220) - 2.21.0 Modified: trunk/add-on-creator/VERSION trunk/add-on-creator/package/yast2-add-on-creator.changes trunk/add-on-creator/src/complex.ycp Modified: trunk/add-on-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/VERSION?rev=65495… ============================================================================== --- trunk/add-on-creator/VERSION (original) +++ trunk/add-on-creator/VERSION Thu Sep 1 12:00:55 2011 @@ -1 +1 @@ -2.20.1 +2.21.0 Modified: trunk/add-on-creator/package/yast2-add-on-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/package/yast2-add… ============================================================================== --- trunk/add-on-creator/package/yast2-add-on-creator.changes (original) +++ trunk/add-on-creator/package/yast2-add-on-creator.changes Thu Sep 1 12:00:55 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Sep 1 12:00:05 CEST 2011 - jsuchome(a)suse.cz + +- update products list (bnc#715220) +- 2.21.0 + +------------------------------------------------------------------- Tue Oct 19 10:33:41 CEST 2010 - jsuchome(a)suse.cz - do not allow spaces in NAME entry (bnc#646060) Modified: trunk/add-on-creator/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/complex.ycp?r… ============================================================================== --- trunk/add-on-creator/src/complex.ycp (original) +++ trunk/add-on-creator/src/complex.ycp Thu Sep 1 12:00:55 2011 @@ -427,10 +427,18 @@ // radio button label _("S&USE Linux Enterprise 11"), requires == "SUSE_SLE-11")), - `Left (`RadioButton(`id("openSUSE-11.2"), `opt (`notify), + `Left (`RadioButton(`id ("SUSE_SLE-11.1"), `opt (`notify), // radio button label - _("openSUSE &11.2"), - requires == "openSUSE-11.2")), + _("SUSE Linux Enterprise 11 SP1"), + requires == "SUSE_SLE-11.1")), + `Left (`RadioButton(`id("openSUSE-11.4"), `opt (`notify), + // radio button label + _("openSUSE 11.&4"), + requires == "openSUSE-11.4")), + `Left (`RadioButton(`id("openSUSE-12.1"), `opt (`notify), + // radio button label + _("openSUSE 12.1"), + requires == "openSUSE-12.1")), `HBox ( `Left(`RadioButton(`id(`other), `opt (`notify), // radio button label -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r65494 - /trunk/installation/control/control.openSUSE.xml
by coolo＠svn2.opensuse.org 01 Sep '11

01 Sep '11

Author: coolo Date: Thu Sep 1 11:08:55 2011 New Revision: 65494 URL: http://svn.opensuse.org/viewcvs/yast?rev=65494&view=rev Log: also install the minimal conflicts Modified: trunk/installation/control/control.openSUSE.xml Modified: trunk/installation/control/control.openSUSE.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.ope… ============================================================================== --- trunk/installation/control/control.openSUSE.xml (original) +++ trunk/installation/control/control.openSUSE.xml Thu Sep 1 11:08:55 2011 @@ -331,7 +331,7 @@ <cursor>DMZ</cursor> <packages>xorg-x11</packages> <order config:type="integer">8</order> - <patterns>minimal_base</patterns> + <patterns>minimal_base minimal_base-conflicts</patterns> <icon>yast-sshd</icon> </one_supported_desktop> -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r65493 - /tags/branch-Code-11-SP2-2_17_109/yast2/
by jsrain＠svn2.opensuse.org 01 Sep '11

01 Sep '11

Author: jsrain Date: Thu Sep 1 09:15:17 2011 New Revision: 65493 URL: http://svn.opensuse.org/viewcvs/yast?rev=65493&view=rev Log: Created tag branch-Code-11-SP2-2_17_109 for yast2 Added: tags/branch-Code-11-SP2-2_17_109/yast2/ (props changed) - copied from r65492, branches/SuSE-Code-11-SP2-Branch/yast2/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r65492 - /tags/stable-2_21_15/yast2/
by jsrain＠svn2.opensuse.org 01 Sep '11

01 Sep '11

Author: jsrain Date: Thu Sep 1 09:15:14 2011 New Revision: 65492 URL: http://svn.opensuse.org/viewcvs/yast?rev=65492&view=rev Log: Created tag stable-2_21_15 for yast2 Added: tags/stable-2_21_15/yast2/ (props changed) - copied from r65491, trunk/yast2/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r65491 - in /branches/SuSE-Code-11-SP2-Branch/yast2: VERSION package/yast2.changes scripts/yast2
by jsrain＠svn2.opensuse.org 01 Sep '11

01 Sep '11

Author: jsrain Date: Thu Sep 1 09:15:09 2011 New Revision: 65491 URL: http://svn.opensuse.org/viewcvs/yast?rev=65491&view=rev Log: enhanced the help command-line parameters (bnc#712271) Modified: branches/SuSE-Code-11-SP2-Branch/yast2/VERSION branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes branches/SuSE-Code-11-SP2-Branch/yast2/scripts/yast2 Modified: branches/SuSE-Code-11-SP2-Branch/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/VERSION Thu Sep 1 09:15:09 2011 @@ -1 +1 @@ -2.17.108 +2.17.109 Modified: branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes Thu Sep 1 09:15:09 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Sep 1 06:40:43 UTC 2011 - jsrain@site + +- enhanced the help command-line parameters (bnc#712271) +- 2.17.109 + +------------------------------------------------------------------- Fri Aug 26 13:26:32 CEST 2011 - locilka(a)suse.cz - Fixed handling of FW_SERVICES_ACCEPT_* in SuSEFirewall modules to Modified: branches/SuSE-Code-11-SP2-Branch/yast2/scripts/yast2 URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/scripts/yast2 (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/scripts/yast2 Thu Sep 1 09:15:09 2011 @@ -220,7 +220,7 @@ while true ; do case "$1" in - -h|--help) printhelp; exit 0 ;; + -h|--help) if test "$2" = '--' -a -n "$3" ; then CMDLINE_HELP="help" ; else printhelp && exit 0 ; fi ; shift ;; -l|--list) listmodules; exit 0 ;; -g|--geometry) Y2_GEOMETRY="-geometry $2"; shift 2; ;; -i|--install) Y2_INSTALL_PACKAGES=true; shift ;; @@ -255,6 +255,10 @@ # Surround all args by (...). args may contain spaces. # Use -S to avoid YCP escaping (bnc#382883) # But avoid a lone -S (cc-gnome dies, bnc#537470) + +if [ -n "$CMDLINE_HELP" ]; then + set -- $@ help; +fi if [ $# -gt 0 ]; then a=("$@") b=("${a[@]/#/(}") -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0