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