February 2012 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r67400 - in /trunk/s390/src: dasd/dialogs.ycp modules/DASDController.ycp modules/ZFCPController.ycp zfcp/dialogs.ycp
by aschnell＠svn2.opensuse.org 10 Feb '12

10 Feb '12

Author: aschnell Date: Fri Feb 10 11:05:53 2012 New Revision: 67400 URL: http://svn.opensuse.org/viewcvs/yast?rev=67400&view=rev Log: - improved device filtering and moved to modules Modified: trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/modules/DASDController.ycp trunk/s390/src/modules/ZFCPController.ycp trunk/s390/src/zfcp/dialogs.ycp Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Fri Feb 10 11:05:53 2012 @@ -74,43 +74,12 @@ * @param max_chan integer maximal channel number * @return a list of terms for the table */ -define list<term> GetDASDDiskItems(string min_channel, string max_channel) ``{ - integer id = 0; +list<term> GetDASDDiskItems() +{ + map<integer, map<string, any> > devices = DASDController::GetFilteredDevices(); list<term> items = []; - integer min_css = tointeger(substring (min_channel, 0, 1)); - integer min_lcss = tointeger(sformat("0x%1",substring (min_channel, 2, 1))); - integer min_chan = tointeger(sformat("0x%1",substring (min_channel, 4, 4))); - - integer max_css = tointeger(substring (max_channel, 0, 1)); - integer max_lcss = tointeger(sformat("0x%1",substring (max_channel, 2, 1))); - integer max_chan = tointeger(sformat("0x%1",substring (max_channel, 4, 4))); - - map<integer,map<string,any> > devices = DASDController::devices; - - if (min_chan > 0 || min_lcss > 0 || min_css > 0 || - max_chan < 0xffff || max_lcss < 0xf || max_css < 0xf) - { - y2milestone ("Filter disks: %1.%2.%3 to %4.%5.%6", - min_css, min_lcss, min_chan, - max_css, max_lcss, max_chan); - - devices = (map<integer,map<string,any> >)filter ( - integer k, map<string,any> d, devices, - ``{ - string channel = d["channel"]:"0.0.0000"; - integer tmp_css = tointeger(substring (channel, 0, 1)); - integer tmp_lcss = tointeger(sformat("0x%1",substring (channel, 2, 1))); - integer tmp_chan = tointeger(sformat("0x%1",substring (channel, 4, 4))); - - return (tmp_css >= min_css && tmp_lcss >= min_lcss && tmp_chan >= min_chan - && tmp_css <= max_css && tmp_lcss <= max_lcss && tmp_chan <= max_chan); - }); - } - - y2milestone ("Current disks: %1", devices); - if (Mode::config ()) { items = (list<term>) maplist (integer k, map<string,any> d, devices, { @@ -254,9 +223,9 @@ term content = `VBox( `HBox( // text entry - `InputField(`id(`min_chan), `opt(`hstretch), _("Mi&nimum Channel"), "0.0.0000"), + `InputField(`id(`min_chan), `opt(`hstretch), _("Mi&nimum Channel"), DASDController::filter_min), // text entry - `InputField(`id(`max_chan), `opt(`hstretch), _("Ma&ximum Channel"), "0.f.ffff"), + `InputField(`id(`max_chan), `opt(`hstretch), _("Ma&ximum Channel"), DASDController::filter_max), `VBox ( `Label (""), // push button @@ -285,23 +254,23 @@ Wizard::SetContents(caption, content, help, true, true); Wizard::HideBackButton(); Wizard::SetAbortButton(`abort, Label::CancelButton() ); + + UI::ChangeWidget(`id(`min_chan), `ValidChars, "0123456789abcdefABCDEF."); + UI::ChangeWidget(`id(`max_chan), `ValidChars, "0123456789abcdefABCDEF."); } /** * Redraw the contents of the widgets in the DASD Dialog */ -define void ReloadDASDDialog () ``{ - DASDController::filter_min = (string) - UI::QueryWidget(`min_chan, `Value); - DASDController::filter_max = (string) - UI::QueryWidget(`max_chan, `Value); +void ReloadDASDDialog() +{ + DASDController::filter_min = (string) UI::QueryWidget(`min_chan, `Value); + DASDController::filter_max = (string) UI::QueryWidget(`max_chan, `Value); DASDController::ProbeDisks (); - list<term> items = GetDASDDiskItems ( - DASDController::filter_min, - DASDController::filter_max); + list<term> items = GetDASDDiskItems(); UI::ChangeWidget(`id(`table), `Items, items); UI::SetFocus (`table); Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Fri Feb 10 11:05:53 2012 @@ -29,9 +29,8 @@ global map<integer, boolean> selected = $[]; -global string filter_min = "0.0.0000"; - -global string filter_max = "f.f.ffff"; + global string filter_min = "0.0.0000"; + global string filter_max = "f.f.ffff"; global map<string, boolean> diag = $[]; @@ -230,6 +229,49 @@ } + global map<integer, map<string, any> > + GetDevices() + { + return devices; + } + + + global map<integer, map<string, any> > + GetFilteredDevices() + { + list<string> min_strs = splitstring(filter_min, "."); + integer min_css = tointeger("0x" + min_strs[0]:"0"); + integer min_lcss = tointeger("0x" + min_strs[1]:"0"); + integer min_chan = tointeger("0x" + min_strs[2]:"0"); + + list<string> max_strs = splitstring(filter_max, "."); + integer max_css = tointeger("0x" + max_strs[0]:"0"); + integer max_lcss = tointeger("0x" + max_strs[1]:"0"); + integer max_chan = tointeger("0x" + max_strs[2]:"0"); + + map<integer, map<string, any> > ret = GetDevices(); + + if (min_chan > 0 || min_lcss > 0 || min_css > 0 || + max_chan < 0xffff || max_lcss < 0xf || max_css < 0xf) + { + y2milestone("filter devices: %1.%2.%3 to %4.%5.%6", min_css, min_lcss, min_chan, + max_css, max_lcss, max_chan); + + ret = filter(integer k, map<string, any> d, ret, { + list<string> tmp_strs = splitstring(d["channel"]:"0.0.0000", "."); + integer tmp_css = tointeger("0x" + tmp_strs[0]:"0"); + integer tmp_lcss = tointeger("0x" + tmp_strs[1]:"0"); + integer tmp_chan = tointeger("0x" + tmp_strs[2]:"0"); + + return tmp_css >= min_css && tmp_lcss >= min_lcss && tmp_chan >= min_chan && + tmp_css <= max_css && tmp_lcss <= max_lcss && tmp_chan <= max_chan; + }); + } + + return ret; + } + + /** * Create a textual summary and a list of unconfigured cards * @return summary of the current configuration Modified: trunk/s390/src/modules/ZFCPController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/ZFCPController.… ============================================================================== --- trunk/s390/src/modules/ZFCPController.ycp (original) +++ trunk/s390/src/modules/ZFCPController.ycp Fri Feb 10 11:05:53 2012 @@ -27,9 +27,8 @@ global map<integer, boolean> selected = $[]; -global string filter_min = "0.0.0000"; - -global string filter_max = "0.f.ffff"; + global string filter_min = "0.0.0000"; + global string filter_max = "f.f.ffff"; global map<string, any> previous_settings = $[]; @@ -201,6 +200,50 @@ ]; } + + global map<integer, map<string, any> > + GetDevices() + { + return devices; + } + + + global map<integer, map<string, any> > + GetFilteredDevices() + { + list<string> min_strs = splitstring(filter_min, "."); + integer min_css = tointeger("0x" + min_strs[0]:"0"); + integer min_lcss = tointeger("0x" + min_strs[1]:"0"); + integer min_chan = tointeger("0x" + min_strs[2]:"0"); + + list<string> max_strs = splitstring(filter_max, "."); + integer max_css = tointeger("0x" + max_strs[0]:"0"); + integer max_lcss = tointeger("0x" + max_strs[1]:"0"); + integer max_chan = tointeger("0x" + max_strs[2]:"0"); + + map<integer, map<string, any> > ret = GetDevices(); + + if (min_chan > 0 || min_lcss > 0 || min_css > 0 || + max_chan < 0xffff || max_lcss < 0xf || max_css < 0xf) + { + y2milestone("filter devices: %1.%2.%3 to %4.%5.%6", min_css, min_lcss, min_chan, + max_css, max_lcss, max_chan); + + ret = filter(integer k, map<string, any> d, ret, { + list<string> tmp_strs = splitstring(d["channel"]:"0.0.0000", "."); + integer tmp_css = tointeger("0x" + tmp_strs[0]:"0"); + integer tmp_lcss = tointeger("0x" + tmp_strs[1]:"0"); + integer tmp_chan = tointeger("0x" + tmp_strs[2]:"0"); + + return tmp_css >= min_css && tmp_lcss >= min_lcss && tmp_chan >= min_chan && + tmp_css <= max_css && tmp_lcss <= max_lcss && tmp_chan <= max_chan; + }); + } + + return ret; + } + + /** * Create a textual summary and a list of unconfigured cards * @return summary of the current configuration Modified: trunk/s390/src/zfcp/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/zfcp/dialogs.ycp (original) +++ trunk/s390/src/zfcp/dialogs.ycp Fri Feb 10 11:05:53 2012 @@ -53,38 +53,11 @@ * @param max_chan integer maximal channel number * @return a list of terms for the table */ -define list<term> GetZFCPDiskItems(string min_channel, string max_channel) ``{ - integer id = 0; - list<term> items = []; - - map<integer,map<string,any> > devices = ZFCPController::devices; +list<term> GetZFCPDiskItems() +{ + map<integer, map<string, any> > devices = ZFCPController::GetFilteredDevices(); - integer min_css = tointeger(substring (min_channel, 0, 1)); - integer min_lcss = tointeger(sformat("0x%1",substring (min_channel, 2, 1))); - integer min_chan = tointeger(sformat("0x%1",substring (min_channel, 4, 4))); - - integer max_css = tointeger(substring (max_channel, 0, 1)); - integer max_lcss = tointeger(sformat("0x%1",substring (max_channel, 2, 1))); - integer max_chan = tointeger(sformat("0x%1",substring (max_channel, 4, 4))); - - - if (min_chan > 0 || min_lcss > 0 || min_css > 0 || - max_chan < 0xffff || max_lcss < 0xf || max_css < 0xf) - { - devices = (map<integer,map<string,any> >)filter ( - integer k, map<string,any> d, devices, - ``{ - string channel = d["detail", "controller_id"]:"0.0.0000"; - integer tmp_css = tointeger(substring (channel, 0, 1)); - integer tmp_lcss = tointeger(sformat("0x%1",substring (channel, 2, 1))); - integer tmp_chan = tointeger(sformat("0x%1",substring (channel, 4, 4))); - - - boolean ret = (tmp_css >= min_css && tmp_lcss >= min_lcss && tmp_chan >= min_chan - && tmp_css <= max_css && tmp_lcss <= max_lcss && tmp_chan <= max_chan); - return ret; - }); - } + list<term> items = []; items = (list<term>) maplist (integer k, map<string,any> d, devices, ``{ string dev_name = (string)(d["dev_name"]:""); @@ -104,16 +77,18 @@ return items; } + /** * Restart the ZFCP-Dialog */ -define void ReloadZFCPDialog () ``{ +void ReloadZFCPDialog() +{ ZFCPController::filter_min = (string) UI::QueryWidget(`min_chan, `Value); ZFCPController::filter_max = (string) UI::QueryWidget(`max_chan, `Value); ZFCPController::ProbeDisks (); - list<term> items = GetZFCPDiskItems (ZFCPController::filter_min, ZFCPController::filter_max); + list<term> items = GetZFCPDiskItems(); UI::ChangeWidget(`id(`table), `Items, items); UI::ChangeWidget (`id (`delete), `Enabled, size (items) > 0); @@ -170,8 +145,12 @@ Wizard::SetContentsButtons(caption, content, help, Label::BackButton(), Label::NextButton()); Wizard::HideBackButton(); Wizard::SetAbortButton(`abort, Label::CancelButton() ); + + UI::ChangeWidget(`id(`min_chan), `ValidChars, "0123456789abcdefABCDEF."); + UI::ChangeWidget(`id(`max_chan), `ValidChars, "0123456789abcdefABCDEF."); } + /** * Show the ZFCP-Dialog * @return symbol From the dialog -- 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] r67399 - in /trunk/dns-server: package/yast2-dns-server.changes src/dialog-masterzone.ycp
by locilka＠svn2.opensuse.org 09 Feb '12

09 Feb '12

Author: locilka Date: Thu Feb 9 15:24:21 2012 New Revision: 67399 URL: http://svn.opensuse.org/viewcvs/yast?rev=67399&view=rev Log: - Fixed transforming records from relative to absolute format. The final dot is added only to records including a zone name (bnc#745560). Modified: trunk/dns-server/package/yast2-dns-server.changes trunk/dns-server/src/dialog-masterzone.ycp Modified: trunk/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/package/yast2-dns-ser… ============================================================================== --- trunk/dns-server/package/yast2-dns-server.changes (original) +++ trunk/dns-server/package/yast2-dns-server.changes Thu Feb 9 15:24:21 2012 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Thu Feb 9 15:16:58 CET 2012 - locilka(a)suse.com + +- Fixed transforming records from relative to absolute format. + The final dot is added only to records including a zone name + (bnc#745560). + ------------------------------------------------------------------- Wed Nov 16 11:55:12 CET 2011 - jsuchome(a)suse.cz Modified: trunk/dns-server/src/dialog-masterzone.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/dialog-masterzone… ============================================================================== --- trunk/dns-server/src/dialog-masterzone.ycp (original) +++ trunk/dns-server/src/dialog-masterzone.ycp Thu Feb 9 15:24:21 2012 @@ -1561,6 +1561,21 @@ return false; } +// Transform a given key/value by adding the ending dot if +// it ends with the current zone name +string TransformRecord (string record) { + string zone_regexp = mergestring ( + splitstring (current_zone["zone"]:"", "."), + "\\." + ); + + // key terminated with zone name without dot + if (regexpmatch (record, ".*\\." + zone_regexp + "$")) + record = record + "."; + + return record; +} + boolean CheckAndModifyRecord (string & type, string & key, string & val) { // (SYNTAX) Checking the record by record-type (true or false) if (CheckNewZoneRecordSyntax ($[ "key" : key, "type" : type, "val" : val ]) != true) { @@ -1601,11 +1616,15 @@ y2milestone("MX Priority decrased to maximal 65535 from %1", prio); } } - } else if (contains (["ns", "mx", "cname"], tolower_type)) { - if (regexpmatch (val, "\\..*[^.]$")) - val = val + "."; - } else if (regexpmatch (key, "\\..*[^.]$")) { - key = key + "."; + } + + if (tolower_type == "cname") { + key = TransformRecord (key); + val = TransformRecord (val); + } else if (contains (["ns", "mx"], tolower_type)) { + val = TransformRecord (val); + } else if (tolower_type == "a") { + key = TransformRecord (key); } } -- 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] r67398 - in /branches/SuSE-Code-11-SP1-Branch/dns-server: package/yast2-dns-server.changes src/dialog-masterzone.ycp
by locilka＠svn2.opensuse.org 09 Feb '12

09 Feb '12

Author: locilka Date: Thu Feb 9 15:22:51 2012 New Revision: 67398 URL: http://svn.opensuse.org/viewcvs/yast?rev=67398&view=rev Log: - Fixed transforming records from relative to absolute format. The final dot is added only to records including a zone name (bnc#745560). Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes branches/SuSE-Code-11-SP1-Branch/dns-server/src/dialog-masterzone.ycp Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes Thu Feb 9 15:22:51 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------ +Thu Feb 9 15:16:58 CET 2012 - locilka(a)suse.com + +- Fixed transforming records from relative to absolute format. + The final dot is added only to records including a zone name + (bnc#745560). + +------------------------------------------------------------------ Mon Jun 20 15:35:29 CEST 2011 - locilka(a)suse.cz - Automatically changing entered forwarder to a localhost IP if Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/src/dialog-masterzone.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/src/dialog-masterzone.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/src/dialog-masterzone.ycp Thu Feb 9 15:22:51 2012 @@ -1560,6 +1560,21 @@ return false; } +// Transform a given key/value by adding the ending dot if +// it ends with the current zone name +string TransformRecord (string record) { + string zone_regexp = mergestring ( + splitstring (current_zone["zone"]:"", "."), + "\\." + ); + + // key terminated with zone name without dot + if (regexpmatch (record, ".*\\." + zone_regexp + "$")) + record = record + "."; + + return record; +} + boolean CheckAndModifyRecord (string & type, string & key, string & val) { // (SYNTAX) Checking the record by record-type (true or false) if (CheckNewZoneRecordSyntax ($[ "key" : key, "type" : type, "val" : val ]) != true) { @@ -1600,11 +1615,15 @@ y2milestone("MX Priority decrased to maximal 65535 from %1", prio); } } - } else if (contains (["ns", "mx", "cname"], tolower_type)) { - if (regexpmatch (val, "\\..*[^.]$")) - val = val + "."; - } else if (regexpmatch (key, "\\..*[^.]$")) { - key = key + "."; + } + + if (tolower_type == "cname") { + key = TransformRecord (key); + val = TransformRecord (val); + } else if (contains (["ns", "mx"], tolower_type)) { + val = TransformRecord (val); + } else if (tolower_type == "a") { + key = TransformRecord (key); } } -- 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] r67397 - in /branches/SuSE-Code-11-SP2-Branch/dns-server: package/yast2-dns-server.changes src/dialog-masterzone.ycp
by locilka＠svn2.opensuse.org 09 Feb '12

09 Feb '12

Author: locilka Date: Thu Feb 9 15:22:36 2012 New Revision: 67397 URL: http://svn.opensuse.org/viewcvs/yast?rev=67397&view=rev Log: - Fixed transforming records from relative to absolute format. The final dot is added only to records including a zone name (bnc#745560). Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes branches/SuSE-Code-11-SP2-Branch/dns-server/src/dialog-masterzone.ycp Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes Thu Feb 9 15:22:36 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------ +Thu Feb 9 15:16:58 CET 2012 - locilka(a)suse.com + +- Fixed transforming records from relative to absolute format. + The final dot is added only to records including a zone name + (bnc#745560). + +------------------------------------------------------------------ Fri Jul 1 14:42:45 CEST 2011 - locilka(a)suse.cz - Fixed a typo (BNC #703099) Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/src/dialog-masterzone.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dns-server/src/dialog-masterzone.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/dns-server/src/dialog-masterzone.ycp Thu Feb 9 15:22:36 2012 @@ -1561,6 +1561,21 @@ return false; } +// Transform a given key/value by adding the ending dot if +// it ends with the current zone name +string TransformRecord (string record) { + string zone_regexp = mergestring ( + splitstring (current_zone["zone"]:"", "."), + "\\." + ); + + // key terminated with zone name without dot + if (regexpmatch (record, ".*\\." + zone_regexp + "$")) + record = record + "."; + + return record; +} + boolean CheckAndModifyRecord (string & type, string & key, string & val) { // (SYNTAX) Checking the record by record-type (true or false) if (CheckNewZoneRecordSyntax ($[ "key" : key, "type" : type, "val" : val ]) != true) { @@ -1601,11 +1616,15 @@ y2milestone("MX Priority decrased to maximal 65535 from %1", prio); } } - } else if (contains (["ns", "mx", "cname"], tolower_type)) { - if (regexpmatch (val, "\\..*[^.]$")) - val = val + "."; - } else if (regexpmatch (key, "\\..*[^.]$")) { - key = key + "."; + } + + if (tolower_type == "cname") { + key = TransformRecord (key); + val = TransformRecord (val); + } else if (contains (["ns", "mx"], tolower_type)) { + val = TransformRecord (val); + } else if (tolower_type == "a") { + key = TransformRecord (key); } } -- 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] r67396 - /tags/stable-2_22_1/profile-manager/
by jsuchome＠svn2.opensuse.org 09 Feb '12

09 Feb '12

Author: jsuchome Date: Thu Feb 9 14:35:54 2012 New Revision: 67396 URL: http://svn.opensuse.org/viewcvs/yast?rev=67396&view=rev Log: Created tag stable-2_22_1 for profile-manager Added: tags/stable-2_22_1/profile-manager/ - copied from r67395, trunk/profile-manager/ -- 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] r67395 - in /trunk/profile-manager: VERSION package/yast2-profile-manager.changes yast2-profile-manager.spec.in
by jsuchome＠svn2.opensuse.org 09 Feb '12

09 Feb '12

Author: jsuchome Date: Thu Feb 9 14:35:20 2012 New Revision: 67395 URL: http://svn.opensuse.org/viewcvs/yast?rev=67395&view=rev Log: - add libtool as buildrequire - 2.22.1 Modified: trunk/profile-manager/VERSION trunk/profile-manager/package/yast2-profile-manager.changes trunk/profile-manager/yast2-profile-manager.spec.in Modified: trunk/profile-manager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/VERSION?rev=6739… ============================================================================== --- trunk/profile-manager/VERSION (original) +++ trunk/profile-manager/VERSION Thu Feb 9 14:35:20 2012 @@ -1 +1 @@ -2.22.0 +2.22.1 Modified: trunk/profile-manager/package/yast2-profile-manager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/package/yast2-pr… ============================================================================== --- trunk/profile-manager/package/yast2-profile-manager.changes (original) +++ trunk/profile-manager/package/yast2-profile-manager.changes Thu Feb 9 14:35:20 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Feb 9 14:22:36 CET 2012 - jsuchome(a)suse.cz + +- add libtool as buildrequire +- 2.22.1 + +------------------------------------------------------------------- Thu Feb 9 08:27:44 CET 2012 - jsuchome(a)suse.cz - confirmed license Modified: trunk/profile-manager/yast2-profile-manager.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/yast2-profile-ma… ============================================================================== --- trunk/profile-manager/yast2-profile-manager.spec.in (original) +++ trunk/profile-manager/yast2-profile-manager.spec.in Thu Feb 9 14:35:20 2012 @@ -3,7 +3,7 @@ @HEADER@ Group: System/YaST License: GPL-2.0 -BuildRequires: gcc-c++ libxcrypt-devel scpm-devel doxygen perl-XML-Writer yast2-devtools yast2-core-devel yast2-users yast2-testsuite update-desktop-files +BuildRequires: gcc-c++ libxcrypt-devel scpm-devel doxygen perl-XML-Writer yast2-devtools yast2-core-devel yast2-users yast2-testsuite update-desktop-files libtool # Wizard::SetDesktopTitleAndIcon Requires: yast2 >= 2.21.22 Requires: yast2-users -- 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] r67394 - in /trunk/ncurses/src: NCAskForFile.cc NCFileSelection.cc
by gs＠svn2.opensuse.org 09 Feb '12

09 Feb '12

Author: gs Date: Thu Feb 9 14:31:53 2012 New Revision: 67394 URL: http://svn.opensuse.org/viewcvs/yast?rev=67394&view=rev Log: set initial file name Modified: trunk/ncurses/src/NCAskForFile.cc trunk/ncurses/src/NCFileSelection.cc Modified: trunk/ncurses/src/NCAskForFile.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCAskForFile.cc?rev=… ============================================================================== --- trunk/ncurses/src/NCAskForFile.cc (original) +++ trunk/ncurses/src/NCAskForFile.cc Thu Feb 9 14:31:53 2012 @@ -238,6 +238,10 @@ dirName->addItem( dirList->getCurrentDir(), true ); // selected + if ( iniFileName == "" ) + // show the currently selected file + fileName->setValue( fileList->getCurrentFile() ); + // event loop do { Modified: trunk/ncurses/src/NCFileSelection.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCFileSelection.cc?r… ============================================================================== --- trunk/ncurses/src/NCFileSelection.cc (original) +++ trunk/ncurses/src/NCFileSelection.cc Thu Feb 9 14:31:53 2012 @@ -409,6 +409,7 @@ const string & filter, const string & iniDir ) : NCFileSelection( parent, tableHeader, type, iniDir ) + , currentFile("") { //fillHeader(); -- 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] r67393 - in /branches/SuSE-Code-11-SP1-Branch/dns-server: package/yast2-dns-server.changes src/dialog-main.ycp
by locilka＠svn2.opensuse.org 09 Feb '12

09 Feb '12

Author: locilka Date: Thu Feb 9 13:45:12 2012 New Revision: 67393 URL: http://svn.opensuse.org/viewcvs/yast?rev=67393&view=rev Log: Backporting from SP2 to SP1 - Automatically changing entered forwarder to a localhost IP if the server would forward to itself (non-local IP) (BNC #676676). Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes branches/SuSE-Code-11-SP1-Branch/dns-server/src/dialog-main.ycp Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes Thu Feb 9 13:45:12 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------ +Mon Jun 20 15:35:29 CEST 2011 - locilka(a)suse.cz + +- Automatically changing entered forwarder to a localhost IP if + the server would forward to itself (non-local IP) (BNC #676676). + +------------------------------------------------------------------ Wed Mar 16 15:51:40 CET 2011 - locilka(a)suse.cz - Handling unknown error in LDAP initialization (BNC #679960). Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/src/dialog-main.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/src/dialog-main.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/src/dialog-main.ycp Thu Feb 9 13:45:12 2012 @@ -428,6 +428,66 @@ } /** + * Returns list of IPs currently used by the system. + * + * @param boolean whether local addresses should be returned as well (the default is false) + */ +list <string> CurrentlyUsedIPs (boolean including_local) { + string cmd = "ip addr show | grep 'inet\$6\$\\?' | sed 's/^[ \\t]\\+inet\$6\$\\?[ \\t]\\+\$[^\\/]\\+\$\\/.*$/\\2/'"; + map cmd_ret = (map) SCR::Execute (.target.bash_output, cmd); + + if (cmd_ret == nil || cmd_ret["exit"]:-1 != 0) { + y2error ("Cannot get list of used IPs: %1", cmd_ret); + return nil; + } + + list <string> used_ips = splitstring (cmd_ret["stdout"]:"", "\n"); + used_ips = filter (string used_ip, used_ips, ``(used_ip != nil && used_ip != "")); + + // Filtering out all local IPs + if (including_local != true) { + used_ips = filter (string used_ip, used_ips, ``( + !regexpmatch(used_ip, "127\.0\.0\..*") && used_ip != "::1" + )); + } + + return used_ips; +} + +/** + * Gets an IP address and returns it's local equivalent: 127.0.0.1 for IPv4, ::1 for IPv6. + * If a given string is neither IPv4 nor IPv6, nil is returned. + * + * @param string IP to transform + * @returns string transformed IP + */ +string ChangeIPToLocalEquivalent (string ip_address) { + string ret = nil; + + if (IP::Check4 (ip_address)) { + ret = "127.0.0.1"; + } else if (IP::Check6 (ip_address)) { + ret = "::1"; + } else { + ret = nil; + } + + y2warning ("Transforming forwarder IP %1 to %2", ip_address, ret); + + if (ret == nil) { + // An error message, %1 is replaced with a variable IP + Report::Error (sformat(_("Cannot find local equivalent for IP %1"), ret)); + } else { + // TRANSLATORS: A warning message, %1 is replaced with the input IP, %2 with the output IP + Report::Warning (sformat(_("Forwarding DNS queries to itself would create an infinite loop. +IP address %1 is currently used by this server, so it has +been changed to its local equivalent %2."), ip_address, ret)); + } + + return ret; +} + +/** * Handle events in a tab of a dialog */ symbol HandleExpertForwardersPage (string key, map event) { @@ -449,6 +509,13 @@ ); return nil; } + + list <string> used_ips = CurrentlyUsedIPs (false); + if (contains (used_ips, new_addr)) { + new_addr = ChangeIPToLocalEquivalent (new_addr); + if (new_addr == nil) return nil; + } + if (contains (forwarders, new_addr)) { // error report -- 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] r67392 - /trunk/ncurses/src/NCRichText.cc
by gs＠svn2.opensuse.org 09 Feb '12

09 Feb '12

Author: gs Date: Thu Feb 9 13:29:36 2012 New Revision: 67392 URL: http://svn.opensuse.org/viewcvs/yast?rev=67392&view=rev Log: restore <tt> - is used in Release Notes Modified: trunk/ncurses/src/NCRichText.cc Modified: trunk/ncurses/src/NCRichText.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCRichText.cc?rev=67… ============================================================================== --- trunk/ncurses/src/NCRichText.cc (original) +++ trunk/ncurses/src/NCRichText.cc Thu Feb 9 13:29:36 2012 @@ -905,7 +905,7 @@ else if ( value == L"li" ) token = T_LI; else if ( value == L"ol" ) { token = T_LEVEL; leveltag = 1; } else if ( value == L"qt" ) token = T_IGNORE; - else if ( value == L"tt" ) token = T_IGNORE; + else if ( value == L"tt" ) token = T_TT; else if ( value == L"ul" ) { token = T_LEVEL; leveltag = 0; } break; -- 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] r67391 - /tags/stable-2_22_3/installation/
by jsuchome＠svn2.opensuse.org 09 Feb '12

09 Feb '12

Author: jsuchome Date: Thu Feb 9 10:55:50 2012 New Revision: 67391 URL: http://svn.opensuse.org/viewcvs/yast?rev=67391&view=rev Log: Created tag stable-2_22_3 for installation Added: tags/stable-2_22_3/installation/ - copied from r67390, trunk/installation/ -- 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] r67390 - in /trunk/installation: VERSION package/yast2-installation.changes startup/YaST2.call
by jsuchome＠svn2.opensuse.org 09 Feb '12

09 Feb '12

Author: jsuchome Date: Thu Feb 9 10:55:25 2012 New Revision: 67390 URL: http://svn.opensuse.org/viewcvs/yast?rev=67390&view=rev Log: - adapt the style only for ssh installation, not vnc (bnc#742777) - 2.22.3 Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/startup/YaST2.call Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=67390&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Thu Feb 9 10:55:25 2012 @@ -1 +1 @@ -2.22.2 +2.22.3 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Thu Feb 9 10:55:25 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Feb 9 10:53:01 CET 2012 - jsuchome(a)suse.cz + +- adapt the style only for ssh installation, not vnc (bnc#742777) +- 2.22.3 + +------------------------------------------------------------------- Tue Feb 7 17:22:46 CET 2012 - tgoettlicher(a)suse.de - Fixed bnc #742777: ssh installation needs to much bandwidth Modified: trunk/installation/startup/YaST2.call URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/YaST2.call?… ============================================================================== --- trunk/installation/startup/YaST2.call (original) +++ trunk/installation/startup/YaST2.call Thu Feb 9 10:55:25 2012 @@ -156,7 +156,6 @@ # prepare VNC installation # --- # - export Y2STYLE="installation_slim" #============================================= # Setup splash screen #--------------------------------------------- -- 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] r67389 - /trunk/ncurses/src/NCRichText.cc
by gs＠svn2.opensuse.org 09 Feb '12

09 Feb '12

Author: gs Date: Thu Feb 9 10:24:42 2012 New Revision: 67389 URL: http://svn.opensuse.org/viewcvs/yast?rev=67389&view=rev Log: call AdjustPrePad correctly (skip tag) Modified: trunk/ncurses/src/NCRichText.cc Modified: trunk/ncurses/src/NCRichText.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCRichText.cc?rev=67… ============================================================================== --- trunk/ncurses/src/NCRichText.cc (original) +++ trunk/ncurses/src/NCRichText.cc Thu Feb 9 10:24:42 2012 @@ -1046,12 +1046,12 @@ if ( !endtag ) { preTag = true; // display text preserving newlines and spaces - AdjustPrePad( sch ); + AdjustPrePad( ech ); } else { preTag = false; - PadNL(); // add new line after pre + PadNL(); // add new line (text may continue after </pre>) } break; -- 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] r67388 - /trunk/ncurses/src/NCRichText.cc
by gs＠svn2.opensuse.org 09 Feb '12

09 Feb '12

Author: gs Date: Thu Feb 9 09:59:03 2012 New Revision: 67388 URL: http://svn.opensuse.org/viewcvs/yast?rev=67388&view=rev Log: add new line after </pre> Modified: trunk/ncurses/src/NCRichText.cc Modified: trunk/ncurses/src/NCRichText.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCRichText.cc?rev=67… ============================================================================== --- trunk/ncurses/src/NCRichText.cc (original) +++ trunk/ncurses/src/NCRichText.cc Thu Feb 9 09:59:03 2012 @@ -1051,6 +1051,7 @@ else { preTag = false; + PadNL(); // add new line after pre } break; -- 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] r67387 - /tags/stable-2_22_0/profile-manager/
by jsuchome＠svn2.opensuse.org 09 Feb '12

09 Feb '12

Author: jsuchome Date: Thu Feb 9 08:28:53 2012 New Revision: 67387 URL: http://svn.opensuse.org/viewcvs/yast?rev=67387&view=rev Log: Created tag stable-2_22_0 for profile-manager Added: tags/stable-2_22_0/profile-manager/ - copied from r67386, trunk/profile-manager/ -- 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] r67386 - in /trunk/profile-manager: ./ package/ src/
by jsuchome＠svn2.opensuse.org 09 Feb '12

09 Feb '12

Author: jsuchome Date: Thu Feb 9 08:28:30 2012 New Revision: 67386 URL: http://svn.opensuse.org/viewcvs/yast?rev=67386&view=rev Log: - confirmed license - 2.22.0 Modified: trunk/profile-manager/VERSION trunk/profile-manager/package/yast2-profile-manager.changes trunk/profile-manager/src/ProfileManager.ycp trunk/profile-manager/src/complex.ycp trunk/profile-manager/src/dialogs.ycp trunk/profile-manager/src/helps.ycp trunk/profile-manager/src/profile-manager.ycp trunk/profile-manager/src/profile_manager.ycp trunk/profile-manager/src/wizards.ycp trunk/profile-manager/yast2-profile-manager.spec.in Modified: trunk/profile-manager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/VERSION?rev=6738… ============================================================================== --- trunk/profile-manager/VERSION (original) +++ trunk/profile-manager/VERSION Thu Feb 9 08:28:30 2012 @@ -1 +1 @@ -2.21.1 +2.22.0 Modified: trunk/profile-manager/package/yast2-profile-manager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/package/yast2-pr… ============================================================================== --- trunk/profile-manager/package/yast2-profile-manager.changes (original) +++ trunk/profile-manager/package/yast2-profile-manager.changes Thu Feb 9 08:28:30 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Feb 9 08:27:44 CET 2012 - jsuchome(a)suse.cz + +- confirmed license +- 2.22.0 + +------------------------------------------------------------------- Tue Sep 27 10:30:21 CEST 2011 - visnov(a)suse.cz - set dialog title Modified: trunk/profile-manager/src/ProfileManager.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/src/ProfileManag… ============================================================================== --- trunk/profile-manager/src/ProfileManager.ycp (original) +++ trunk/profile-manager/src/ProfileManager.ycp Thu Feb 9 08:28:30 2012 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * File: modules/ProfileManager.ycp * Package: Configuration of profile-manager Modified: trunk/profile-manager/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/src/complex.ycp?… ============================================================================== --- trunk/profile-manager/src/complex.ycp (original) +++ trunk/profile-manager/src/complex.ycp Thu Feb 9 08:28:30 2012 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * File: include/profile-manager/complex.ycp * Package: Configuration of profile-manager Modified: trunk/profile-manager/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/src/dialogs.ycp?… ============================================================================== --- trunk/profile-manager/src/dialogs.ycp (original) +++ trunk/profile-manager/src/dialogs.ycp Thu Feb 9 08:28:30 2012 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * File: include/profile-manager/dialogs.ycp * Package: Configuration of profile-manager Modified: trunk/profile-manager/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/src/helps.ycp?re… ============================================================================== --- trunk/profile-manager/src/helps.ycp (original) +++ trunk/profile-manager/src/helps.ycp Thu Feb 9 08:28:30 2012 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * File: include/profile-manager/helps.ycp * Package: Configuration of profile-manager Modified: trunk/profile-manager/src/profile-manager.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/src/profile-mana… ============================================================================== --- trunk/profile-manager/src/profile-manager.ycp (original) +++ trunk/profile-manager/src/profile-manager.ycp Thu Feb 9 08:28:30 2012 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * File: clients/profile-manager.ycp * Package: Configuration of profile-manager Modified: trunk/profile-manager/src/profile_manager.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/src/profile_mana… ============================================================================== --- trunk/profile-manager/src/profile_manager.ycp (original) +++ trunk/profile-manager/src/profile_manager.ycp Thu Feb 9 08:28:30 2012 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * Author: Martin Vidner <mvidner(a)suse.cz> * Summary: Just a redirection Modified: trunk/profile-manager/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/src/wizards.ycp?… ============================================================================== --- trunk/profile-manager/src/wizards.ycp (original) +++ trunk/profile-manager/src/wizards.ycp Thu Feb 9 08:28:30 2012 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * File: include/profile-manager/wizards.ycp * Package: Configuration of profile-manager Modified: trunk/profile-manager/yast2-profile-manager.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/yast2-profile-ma… ============================================================================== --- trunk/profile-manager/yast2-profile-manager.spec.in (original) +++ trunk/profile-manager/yast2-profile-manager.spec.in Thu Feb 9 08:28:30 2012 @@ -1,8 +1,8 @@ @HEADER-COMMENT@ @HEADER@ -Group: System/YaST -License: GPL-2.0+ +Group: System/YaST +License: GPL-2.0 BuildRequires: gcc-c++ libxcrypt-devel scpm-devel doxygen perl-XML-Writer yast2-devtools yast2-core-devel yast2-users yast2-testsuite update-desktop-files # Wizard::SetDesktopTitleAndIcon Requires: yast2 >= 2.21.22 -- 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] r67385 - in /trunk/qt: VERSION.cmake package/yast2-qt.changes src/YQLogView.cc src/YQLogView.h
by tgoettlicher＠svn2.opensuse.org 08 Feb '12

08 Feb '12

Author: tgoettlicher Date: Wed Feb 8 14:54:36 2012 New Revision: 67385 URL: http://svn.opensuse.org/viewcvs/yast?rev=67385&view=rev Log: Fixed bnc#731540: fixed auto-scroll in LogView (2.22.2) Modified: trunk/qt/VERSION.cmake trunk/qt/package/yast2-qt.changes trunk/qt/src/YQLogView.cc trunk/qt/src/YQLogView.h Modified: trunk/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION.cmake?rev=67385&r1=67… ============================================================================== --- trunk/qt/VERSION.cmake (original) +++ trunk/qt/VERSION.cmake Wed Feb 8 14:54:36 2012 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "22") -SET(VERSION_PATCH "1") +SET(VERSION_PATCH "2") Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=… ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Wed Feb 8 14:54:36 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Feb 8 14:54:15 CET 2012 - tgoettlicher(a)suse.de + +- Fixed bnc#731540: fixed auto-scroll in LogView +- Version: 2.22.2 + +------------------------------------------------------------------- Tue Dec 20 16:30:28 CET 2011 - tgoettlicher(a)suse.de - Confirmed license Modified: trunk/qt/src/YQLogView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQLogView.cc?rev=67385&r1… ============================================================================== --- trunk/qt/src/YQLogView.cc (original) +++ trunk/qt/src/YQLogView.cc Wed Feb 8 14:54:36 2012 @@ -73,7 +73,7 @@ YUI_CHECK_NEW( _caption ); layout->addWidget( _caption ); - _qt_text = new QTextEdit( this ); + _qt_text = new MyTextEdit( this ); YUI_CHECK_NEW( _qt_text ); layout->addWidget( _qt_text ); @@ -82,6 +82,9 @@ _qt_text->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); _caption->setBuddy( _qt_text ); + + connect (_qt_text, SIGNAL(resized()), this, SLOT(slotResize())); + } @@ -119,6 +122,7 @@ { _qt_text->moveCursor( QTextCursor::End ); _qt_text->ensureCursorVisible(); + sb->setValue( sb->maximum() ); } _lastText = newString; @@ -163,6 +167,20 @@ return max( 80, hintHeight ); } +void +YQLogView::slotResize() +{ + QScrollBar *sb = _qt_text->verticalScrollBar(); + + bool atEnd = sb->value() == sb->maximum(); + + if (atEnd) + { + _qt_text->moveCursor( QTextCursor::End ); + _qt_text->ensureCursorVisible(); + sb->setValue( sb->maximum() ); + } +} void YQLogView::setSize( int newWidth, int newHeight ) Modified: trunk/qt/src/YQLogView.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQLogView.h?rev=67385&r1=… ============================================================================== --- trunk/qt/src/YQLogView.h (original) +++ trunk/qt/src/YQLogView.h Wed Feb 8 14:54:36 2012 @@ -49,6 +49,8 @@ #include "YLogView.h" class YQWidgetCaption; +class MyTextEdit; + class YQLogView : public QFrame, public YLogView @@ -127,8 +129,32 @@ protected: YQWidgetCaption * _caption; - QTextEdit * _qt_text; + MyTextEdit * _qt_text; QString _lastText; + +private slots: + void slotResize(); + +}; + + +// We need a resize event in order to set the cursor to the last line +// for the auto-scroll feature +class MyTextEdit : public QTextEdit +{ + Q_OBJECT + public: + MyTextEdit( QWidget* parent ) : QTextEdit (parent) {} + + protected: + void resizeEvent ( QResizeEvent * event ) + { emit resized(); + QTextEdit::resizeEvent(event); + } + + signals: + void resized(); + }; -- 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] r67384 - /trunk/ycp-ui-bindings/examples/RichText4.ycp
by gs＠svn2.opensuse.org 08 Feb '12

08 Feb '12

Author: gs Date: Wed Feb 8 14:34:21 2012 New Revision: 67384 URL: http://svn.opensuse.org/viewcvs/yast?rev=67384&view=rev Log: example for RichText (common tags) Added: trunk/ycp-ui-bindings/examples/RichText4.ycp Added: trunk/ycp-ui-bindings/examples/RichText4.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/examples/RichTex… ============================================================================== --- trunk/ycp-ui-bindings/examples/RichText4.ycp (added) +++ trunk/ycp-ui-bindings/examples/RichText4.ycp Wed Feb 8 14:34:21 2012 @@ -0,0 +1,22 @@ +// Example for a RichText widget +{ + UI::OpenDialog( `opt(`defaultsize), + `VBox( + `RichText( "<h3>RichText example</h3>" + + "This is a RichText widget." + + "It's very much like HTML, but not quite as powerful." + + "bold and italic you can rely on." + + "-i-: keep the installed version and never update or delete it ( package locked )" + + " i : All requirements of this pattern/language are satisfied" + + "The product name is automatically replaced by the UI. " + + "Use the special macro &product; for that." + + "" + + "The current product name is &product;." + + "" + ), + `PushButton(`opt(`default), "&OK") + ) + ); + UI::UserInput(); + UI::CloseDialog(); +} -- 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] r67383 - /trunk/ycp-ui-bindings/examples/RichText5.ycp
by gs＠svn2.opensuse.org 08 Feb '12

08 Feb '12

Author: gs Date: Wed Feb 8 14:31:12 2012 New Revision: 67383 URL: http://svn.opensuse.org/viewcvs/yast?rev=67383&view=rev Log: additional test for text in <pre> Added: trunk/ycp-ui-bindings/examples/RichText5.ycp Added: trunk/ycp-ui-bindings/examples/RichText5.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/examples/RichTex… ============================================================================== --- trunk/ycp-ui-bindings/examples/RichText5.ycp (added) +++ trunk/ycp-ui-bindings/examples/RichText5.ycp Wed Feb 8 14:31:12 2012 @@ -0,0 +1,12 @@ +// Example for a RichText widget +{ + UI::OpenDialog( `opt(`defaultsize), + `VBox( + `RichText( "<pre>\--- /.snapshots/4/snapshot/var/lib/zypp/RequestedLocales\t2011-12-08 17:09:23.312007703 +0800 +++ /.snapshots/5/snapshot/var/lib/zypp/RequestedLocales\t2011-12-08 18:39:35.461081330 +0800 @@ -1,4 +1,4 @@ -# zypp::RequestedLocales generated Thu 08 Dec 2011 05:09:23 PM WST +# zypp::RequestedLocales generated Do 08 Dez 2011 18:39:35 WST # -de_DE +en_US # </pre>" + ), + `PushButton(`opt(`default), "&OK") + ) + ); + UI::UserInput(); + UI::CloseDialog(); +} -- 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] r67382 - /trunk/ycp-ui-bindings/examples/RichText3.ycp
by gs＠svn2.opensuse.org 08 Feb '12

08 Feb '12

Author: gs Date: Wed Feb 8 14:30:20 2012 New Revision: 67382 URL: http://svn.opensuse.org/viewcvs/yast?rev=67382&view=rev Log: correct text regarding new impl. of <pre> Modified: trunk/ycp-ui-bindings/examples/RichText3.ycp Modified: trunk/ycp-ui-bindings/examples/RichText3.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/examples/RichTex… ============================================================================== --- trunk/ycp-ui-bindings/examples/RichText3.ycp (original) +++ trunk/ycp-ui-bindings/examples/RichText3.ycp Wed Feb 8 14:30:20 2012 @@ -7,24 +7,26 @@ + "It's very much like HTML, but not quite as powerful." + "Text in pre tags preserves newlines and spaces." + "<pre>" - + " host ip adress host ip adress\n" - + " sturm 10.10.0.159 sturm 10.10.0.159\n\n" - + "Lines are not wrapped; in text mode HTML tags are not removed if the pre tag is used, " - + "but entities like product: &product; are filtered and shown correctly.\n" + + "Table in pre\n" + + " host\tip adress info description\n" + + " sturm\t10.10.0.159 old work station\n\n" + + "Lines are not wrapped but HTML tags are interpreted" + + " and entities like product: &product; are filtered and shown correctly." + "</pre>" + "After /pre the text is HTML text like before." + "Much much more text .............. continous" + " much much more text .... follows " + " much much more text ................." + "<pre>another pre t t </pre>" - + "and more text after pre is closed, now HTML text " + + "and more text after pre is closed, now HTML text,\n" + + "newlines are removed." + "" - + "<pre>Another text in pre preserving spaces and newlines\n" + + "<pre>Another text in pre preserving spaces and newlines\n" + " host ip adress host ip adress\n" + " sturm 10.10.0.159 sturm 10.10.0.159\n" - + "Lines are not wrapped; in text mode HTML tags are not removed if the pre tag is used.\n" + + "Lines are not wrapped; in newest version HTML tags are interpreted \tif the pre tag is used.\n" + "</pre>" - + "And after closing pre tag much more text - long long long long long lines are now wrapped again, this is a very very very very long long long long long long line Even longer and longer" + + "And after closing pre tag much more text - long long long long long lines are now wrapped again, this is a very very very very long long long long long long line Even longer and longer, line is wrapped again" + "<pre>And another short pre</pre>" ), `PushButton(`opt(`default), "&OK") -- 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] r67381 - /trunk/nfs-client/yast2-nfs-client.spec.in
by mfilka＠svn2.opensuse.org 08 Feb '12

08 Feb '12

Author: mfilka Date: Wed Feb 8 13:39:34 2012 New Revision: 67381 URL: http://svn.opensuse.org/viewcvs/yast?rev=67381&view=rev Log: Formated spec file for obs. Modified: trunk/nfs-client/yast2-nfs-client.spec.in Modified: trunk/nfs-client/yast2-nfs-client.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/yast2-nfs-client.spec… ============================================================================== --- trunk/nfs-client/yast2-nfs-client.spec.in (original) +++ trunk/nfs-client/yast2-nfs-client.spec.in Wed Feb 8 13:39:34 2012 @@ -1,26 +1,26 @@ @HEADER-COMMENT@ @HEADER@ -Group: System/YaST +Group: System/YaST License: GPL-2.0+ -BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite +BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite #ag_showexports moved to yast2 base #Wizard::SetDesktopTitleAndIcon -Requires: yast2 >= 2.21.22 +Requires: yast2 >= 2.21.22 #idmapd_conf agent -Requires: yast2-nfs-common +Requires: yast2-nfs-common # showmount, #150382, #286300 -Recommends: nfs-client +Recommends: nfs-client -Provides: yast2-config-nfs yast2-config-nfs-devel -Obsoletes: yast2-config-nfs yast2-config-nfs-devel -Provides: yast2-trans-nfs -Obsoletes: yast2-trans-nfs -Provides: yast2-config-network:/usr/lib/YaST2/clients/lan_nfs_client.ycp +Provides: yast2-config-nfs yast2-config-nfs-devel +Obsoletes: yast2-config-nfs yast2-config-nfs-devel +Provides: yast2-trans-nfs +Obsoletes: yast2-trans-nfs +Provides: yast2-config-network:/usr/lib/YaST2/clients/lan_nfs_client.ycp -BuildArchitectures: noarch +BuildArch: noarch -Summary: YaST2 - NFS Configuration +Summary: YaST2 - NFS Configuration %description The YaST2 component for configuration of NFS. NFS stands for network @@ -50,3 +50,5 @@ @desktopdir@/nfs.desktop %doc @docdir@ @schemadir@/autoyast/rnc/nfs.rnc + +%changelog -- 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] r67380 - /trunk/ncurses/src/NCRichText.h
by gs＠svn2.opensuse.org 08 Feb '12

08 Feb '12

Author: gs Date: Wed Feb 8 13:27:40 2012 New Revision: 67380 URL: http://svn.opensuse.org/viewcvs/yast?rev=67380&view=rev Log: add AdjustPrePad Modified: trunk/ncurses/src/NCRichText.h Modified: trunk/ncurses/src/NCRichText.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCRichText.h?rev=673… ============================================================================== --- trunk/ncurses/src/NCRichText.h (original) +++ trunk/ncurses/src/NCRichText.h Wed Feb 8 13:27:40 2012 @@ -212,6 +212,7 @@ void PadWS( const bool tab = false ); void PadTXT( const wchar_t * sch, const unsigned len ); void PadPreTXT( const wchar_t * sch, const unsigned len ); + void AdjustPrePad( const wchar_t * sch ); bool PadTOKEN( const wchar_t * sch, const wchar_t *& ech ); protected: -- 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] r67379 - /trunk/ncurses/src/NCRichText.cc
by gs＠svn2.opensuse.org 08 Feb '12

08 Feb '12

Author: gs Date: Wed Feb 8 13:26:38 2012 New Revision: 67379 URL: http://svn.opensuse.org/viewcvs/yast?rev=67379&view=rev Log: improve adjusting of pad size or text in <pre> tags Modified: trunk/ncurses/src/NCRichText.cc Modified: trunk/ncurses/src/NCRichText.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCRichText.cc?rev=67… ============================================================================== --- trunk/ncurses/src/NCRichText.cc (original) +++ trunk/ncurses/src/NCRichText.cc Wed Feb 8 13:26:38 2012 @@ -347,22 +347,13 @@ void NCRichText::PadPreTXT( const wchar_t * osch, const unsigned olen ) { wstring wtxt( osch, olen ); - + // resolve the entities even in PRE (#71718) wtxt = filterEntities( wtxt ); NCstring nctxt( wtxt ); NCtext ftext( nctxt ); - int len = textWidth( wtxt ); - - if ( cc + len > textwidth ) - { - textwidth = cc + len; - AdjustPad( wsze(cl + ftext.Lines(), textwidth) ); - yuiDebug() << "Adjust: " << cl+ftext.Lines() << " " << textwidth << endl; - } - // insert the text const wchar_t * sch = wtxt.data(); @@ -370,9 +361,6 @@ { myPad()->addwstr( sch, 1 ); // add one wide chararacter - if ( iswprint( *sch ) ) - cc += wcwidth( *sch ); // wcwidth for \t returns -1 - ++sch; } } @@ -432,7 +420,74 @@ } +void NCRichText::AdjustPrePad( const wchar_t *osch ) +{ + const wchar_t * wch = osch; + wstring wstr( wch, 6 ); + + size_t llen = 0; // longest line + size_t tmp_len = 0; // width of current line + + list<NCstring>::const_iterator line; // iterator for list <NCstring> mtext + std::wstring::const_iterator wstr_it; // iterator for wstring + + do + { + ++wch; + wstr.assign( wch, 6 ); + } + while ( *wch && wstr != L"</pre>" ); + + wstring wtxt( osch, wch - osch ); + + // resolve the entities to get correct length for calculation of longest line + wtxt = filterEntities( wtxt ); + + wstring to_repl = L" "; + size_t pos; + + // replace by \n to get appropriate lines in NCtext + for ( ; (pos = wtxt.find( to_repl )) != wstring::npos ; ) + wtxt.replace( pos, to_repl.length(), L"\n" ); + + yuiDebug() << "Input: " << wtxt << " olen: " << wch - osch << endl; + + NCstring nctxt( wtxt ); + NCtext ftext( nctxt ); + + // iterate through NCtext + for ( line = ftext.Text().begin(); line != ftext.Text().end(); ++line ) + { + tmp_len = 0; + + for ( wstr_it = ( *line ).str().begin(); wstr_it != ( *line ).str().end() ; ++wstr_it ) + { + // skip html tags + if ( *wstr_it == '<' ) + { + wstr_it = find(wstr_it, (*line).str().end(), L'>'); + } + else if ( *wstr_it == '\t' ) + { + tmp_len += myPad()->tabsize(); + } + else + { + tmp_len += wcwidth( *wstr_it ); + } + } + + if ( tmp_len > llen ) + llen = tmp_len; + } + if ( llen > textwidth ) + { + textwidth = llen; + AdjustPad( wsze( cl + ftext.Lines(), llen ) ); // adjust pad to longest line + } + +} void NCRichText::DrawHTMLPad() { @@ -470,20 +525,15 @@ { switch ( *wch ) { - case L' ': // add white space + case L' ': // add white space + case L'\t': myPad()->addwstr( wch, 1 ); - cc+=wcwidth( *wch ); break; case L'\n': PadNL(); // add new line break; - case L'\t': // add tab - myPad()->addwstr( wch, 1 ); - cc += myPad()->tabsize(); - break; - default: yuiDebug() << "Ignoring " << *wch << endl; } @@ -996,11 +1046,11 @@ if ( !endtag ) { preTag = true; // display text preserving newlines and spaces + AdjustPrePad( sch ); } else { preTag = false; - PadNL(); // add new line after pre } break; -- 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] r67378 - /tags/stable-2_21_3/nfs-client/
by mfilka＠svn2.opensuse.org 08 Feb '12

08 Feb '12

Author: mfilka Date: Wed Feb 8 13:11:04 2012 New Revision: 67378 URL: http://svn.opensuse.org/viewcvs/yast?rev=67378&view=rev Log: Created tag stable-2_21_3 for nfs-client Added: tags/stable-2_21_3/nfs-client/ (props changed) - copied from r67377, trunk/nfs-client/ -- 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] r67377 - in /trunk/nfs-client: VERSION package/yast2-nfs-client.changes src/ui.ycp
by mfilka＠svn2.opensuse.org 08 Feb '12

08 Feb '12

Author: mfilka Date: Wed Feb 8 13:03:57 2012 New Revision: 67377 URL: http://svn.opensuse.org/viewcvs/yast?rev=67377&view=rev Log: Base server hostname combobox on existing values - bnc#547983 Modified: trunk/nfs-client/VERSION trunk/nfs-client/package/yast2-nfs-client.changes trunk/nfs-client/src/ui.ycp Modified: trunk/nfs-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/VERSION?rev=67377&r1=… ============================================================================== --- trunk/nfs-client/VERSION (original) +++ trunk/nfs-client/VERSION Wed Feb 8 13:03:57 2012 @@ -1 +1 @@ -2.21.2 +2.21.3 Modified: trunk/nfs-client/package/yast2-nfs-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/package/yast2-nfs-cli… ============================================================================== --- trunk/nfs-client/package/yast2-nfs-client.changes (original) +++ trunk/nfs-client/package/yast2-nfs-client.changes Wed Feb 8 13:03:57 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Feb 8 12:00:10 UTC 2012 - mfilka(a)suse.com + +- Base server hostname combobox on existing values - bnc#547983 + +------------------------------------------------------------------- Wed Dec 7 10:05:12 UTC 2011 - coolo(a)suse.com - fix license to be in spdx.org format Modified: trunk/nfs-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/ui.ycp?rev=67377&… ============================================================================== --- trunk/nfs-client/src/ui.ycp (original) +++ trunk/nfs-client/src/ui.ycp Wed Feb 8 13:03:57 2012 @@ -58,6 +58,11 @@ list<string> hosts = nil; /** + * List of already defined nfs mount points + */ + list< map <string,any> > nfs_entries = Nfs::nfs_entries; + + /** * Let the user choose one of a list of items * @param title selectionbox title * @param items a list of items @@ -178,6 +183,7 @@ `Bottom (button) ); } + /** * Ask user for an entry. * @param fstab_ent $["spec": "file": "mntops":] or nil @@ -213,6 +219,21 @@ servers = [ proposed_server ]; } + // append already defined servers - bug #547983 + foreach( map nfs_entry, nfs_entries, + { + term couple = SpecToServPath( nfs_entry[ "spec"]:""); + string known_server = ""; + + known_server = couple[0]:""; + + if( !contains( servers, known_server)) + servers = add( servers, known_server); + }); + + servers = sort( servers); + // + UI::OpenDialog( `opt(`decorated), `HBox( @@ -232,7 +253,8 @@ ), `HSpacing(0.5), TextAndButton ( - `TextEntry(`id(`pathent), + `InputField( `id(`pathent), + `opt(`hstretch), // textentry label _("&Remote Directory"), pth), // pushbutton label, @@ -245,7 +267,8 @@ `Left( `CheckBox(`id(`nfs4), _("NFS&v4 Share"), nfs4)), `Left( TextAndButton ( - `TextEntry(`id(`mountent), + `InputField(`id(`mountent), + `opt(`hstretch), // textentry label _("&Mount Point (local)"), mount), // button label @@ -256,7 +279,7 @@ ), // textentry label `VSpacing(0.2), - `TextEntry(`id(`optionsent), _("O&ptions"), options), + `InputField(`id(`optionsent), `opt( `hstretch), _("O&ptions"), options), `VSpacing(0.2), `ButtonBox( `PushButton(`id(`ok), `opt(`default, `key_F10), Label::OKButton()), @@ -468,7 +491,6 @@ ]; map<string,any> fw_cwm_widget = CWMFirewallInterfaces::CreateOpenFirewallWidget (fw_settings); - list< map <string,any> > nfs_entries = Nfs::nfs_entries; map <string, any> modify_line = $[]; // Help, part 1 of 3 -- 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] r67376 - /tags/stable-2_22_2/installation/
by tgoettlicher＠svn2.opensuse.org 07 Feb '12

07 Feb '12

Author: tgoettlicher Date: Tue Feb 7 17:27:01 2012 New Revision: 67376 URL: http://svn.opensuse.org/viewcvs/yast?rev=67376&view=rev Log: Created tag stable-2_22_2 for installation Added: tags/stable-2_22_2/installation/ - copied from r67375, trunk/installation/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0