Author: jsuchome Date: Thu Mar 5 13:47:58 2009 New Revision: 55932 URL: http://svn.opensuse.org/viewcvs/yast?rev=55932&view=rev Log: - fixed distribution name: OpenSUSE -> openSUSE (bnc#479737) - 2.18.1 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=55932&r1=55931&r2=55932&view=diff ============================================================================== --- trunk/add-on-creator/VERSION (original) +++ trunk/add-on-creator/VERSION Thu Mar 5 13:47:58 2009 @@ -1 +1 @@ -2.18.0 +2.18.1 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-on-creator.changes?rev=55932&r1=55931&r2=55932&view=diff ============================================================================== --- trunk/add-on-creator/package/yast2-add-on-creator.changes (original) +++ trunk/add-on-creator/package/yast2-add-on-creator.changes Thu Mar 5 13:47:58 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Mar 5 13:40:08 CET 2009 - jsuchome@suse.cz + +- fixed distribution name: OpenSUSE -> openSUSE (bnc#479737) +- 2.18.1 + +------------------------------------------------------------------- Mon Jan 19 15:52:12 CET 2009 - jsuchome@suse.cz - generate package metadata for -release packages (bnc#466327) Modified: trunk/add-on-creator/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/complex.ycp?rev=55932&r1=55931&r2=55932&view=diff ============================================================================== --- trunk/add-on-creator/src/complex.ycp (original) +++ trunk/add-on-creator/src/complex.ycp Thu Mar 5 13:47:58 2009 @@ -376,12 +376,6 @@ map current_product = AddOnCreator::current_product; - /* - string requires = AddOnCreator::product_info["requires","value"]:""; - if (requires == "") - requires = "openSUSE-release = 11.1"; - */ - // try to read existing product dependency and transform it to one string // easily understanable list requres_l = AddOnCreator::product_info["requires","value"]:[]; @@ -390,20 +384,7 @@ string requires = ""; if (requires_m["name"]:"" != "") requires = sformat ("%1-%2", requires_m["name"]:"", requires_m["version"]:""); - else - { - /* TODO read current product infow: -jsuchome@rivendell:~> more /etc/SuSE-release -openSUSE 11.1 Beta 3 (i586) -VERSION = 11.1 - -dhcp86:~ # more /etc/SuSE-release -SUSE Linux Enterprise Server 11 (x86_64) -VERSION = 11 -PATCHLEVEL = 0 - */ - } string requires_orig = requires; string old_dir = current_product["rpm_path"]:""; @@ -446,15 +427,14 @@ // radio button label _("S&USE Linux Enterprise 11"), requires == "SUSE_SLE-11")), - `Left (`RadioButton(`id("openSUSE-11.1"), `opt (`notify), + `Left (`RadioButton(`id("openSUSE-11.2"), `opt (`notify), // radio button label - _("OpenSUSE &11.1"), - requires == "openSUSE-11.1")), + _("openSUSE &11.2"), + requires == "openSUSE-11.2")), `HBox ( `Left(`RadioButton(`id(`other), `opt (`notify), // radio button label _("&Other"))) -// `InputField (`id(`other_val), "") ) ))) ), @@ -493,12 +473,7 @@ { UI::ChangeWidget (`id(`rd), `Value, `other); requires = ""; // empty string means other than predefined values -// UI::ChangeWidget (`id(`other_val), `Value, requires); } - /* - UI::ChangeWidget (`id(`other_val), `Enabled, - UI::QueryWidget (`id(`rd), `Value) == `other); - */ any ret = nil; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org