Author: jsuchome Date: Tue Oct 19 10:34:44 2010 New Revision: 62650 URL: http://svn.opensuse.org/viewcvs/yast?rev=62650&view=rev Log: - do not allow spaces in NAME entry (bnc#646060) - 2.20.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=62650&r1=62649&r2=62650&view=diff ============================================================================== --- trunk/add-on-creator/VERSION (original) +++ trunk/add-on-creator/VERSION Tue Oct 19 10:34:44 2010 @@ -1 +1 @@ -2.20.0 +2.20.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=62650&r1=62649&r2=62650&view=diff ============================================================================== --- trunk/add-on-creator/package/yast2-add-on-creator.changes (original) +++ trunk/add-on-creator/package/yast2-add-on-creator.changes Tue Oct 19 10:34:44 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Oct 19 10:33:41 CEST 2010 - jsuchome@suse.cz + +- do not allow spaces in NAME entry (bnc#646060) +- 2.20.1 + +------------------------------------------------------------------- Mon Aug 9 10:31:21 CEST 2010 - jsuchome@suse.cz - correct file name of exported keys (bnc#622569) Modified: trunk/add-on-creator/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/complex.ycp?rev=62650&r1=62649&r2=62650&view=diff ============================================================================== --- trunk/add-on-creator/src/complex.ycp (original) +++ trunk/add-on-creator/src/complex.ycp Tue Oct 19 10:34:44 2010 @@ -118,7 +118,7 @@ map content_map = add_on["content_map"]:$[]; i = i + 1; return `item (`id (i), - content_map["NAME"]:content_map["PRODUCT"]:"", + content_map["LABEL"]:content_map["NAME"]:"", content_map["VERSION"]:""); }); } @@ -392,7 +392,7 @@ current_product["rpm_path"] = ""; map content_map = AddOnCreator::content_map; - string product = content_map["NAME"]:content_map["PRODUCT"]:""; + string product = content_map["LABEL"]:""; string old_product = product == "" ? nil : product; string version = content_map["VERSION"]:""; @@ -405,7 +405,7 @@ `HBox ( `InputField (`id (`product), `opt (`hstretch), // textentry label - _("&Add-On Product Name"), product), + _("&Add-On Product Label"), product), // textentry label `InputField (`id (`version), `opt (`hstretch), _("&Version"), version) @@ -550,7 +550,9 @@ ]; } - AddOnCreator::content_map["NAME"] = product; + AddOnCreator::content_map["LABEL"] = product; + // proposal for NAME: replace spaces with underscores + AddOnCreator::content_map["NAME"] = mergestring (splitstring (product, " "), "_"); AddOnCreator::content_map["VERSION"] = version; // FIXME propose DISTRIBUTION as NAME - VERSION? -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org