February 2012 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r67537 - in /trunk/s390/src/modules: DASDController.ycp ZFCPController.ycp
by aschnell＠svn2.opensuse.org 23 Feb '12

23 Feb '12

Author: aschnell Date: Thu Feb 23 17:14:45 2012 New Revision: 67537 URL: http://svn.opensuse.org/viewcvs/yast?rev=67537&view=rev Log: - use xdigit in regexps Modified: trunk/s390/src/modules/DASDController.ycp trunk/s390/src/modules/ZFCPController.ycp 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 Thu Feb 23 17:14:45 2012 @@ -91,7 +91,7 @@ global boolean IsValidChannel(string channel) { - string regexp = "^([0-9a-fA-F]{1}).([0-9a-fA-F]{1}).([0-9a-fA-F]{1,4})$"; + string regexp = "^([[:xdigit:]]{1}).([[:xdigit:]]{1}).([[:xdigit:]]{4})$"; return regexpmatch(channel, regexp); } @@ -100,9 +100,7 @@ if (!IsValidChannel(channel)) return channel; - list<string> strs = splitstring(tolower(channel), "."); - strs[2] = String::PadZeros(strs[2]:"", 4); - return mergestring(strs, "."); + return tolower(channel); } 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 Thu Feb 23 17:14:45 2012 @@ -16,7 +16,6 @@ import "Mode"; import "Report"; import "Popup"; - import "String"; global map<integer,map<string,any> > devices = $[]; @@ -78,7 +77,7 @@ global boolean IsValidChannel(string channel) { - string regexp = "^([0-9a-fA-F]{1}).([0-9a-fA-F]{1}).([0-9a-fA-F]{1,4})$"; + string regexp = "^([[:xdigit:]]{1}).([[:xdigit:]]{1}).([[:xdigit:]]{4})$"; return regexpmatch(channel, regexp); } @@ -87,14 +86,12 @@ if (!IsValidChannel(channel)) return channel; - list<string> strs = splitstring(tolower(channel), "."); - strs[2] = String::PadZeros(strs[2]:"", 4); - return mergestring(strs, "."); + return tolower(channel); } global boolean IsValidWWPN(string wwpn) { - string regexp = "^0x([0-9a-fA-F]{1,16})$"; + string regexp = "^0x([[:xdigit:]]{1,16})$"; return regexpmatch(wwpn, regexp); } @@ -108,7 +105,7 @@ global boolean IsValidFCPLUN(string fcp_lun) { - string regexp = "^0x([0-9a-fA-F]{1,16})$"; + string regexp = "^0x([[:xdigit:]]{1,16})$"; return regexpmatch(fcp_lun, regexp); } -- 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] r67536 - in /branches/SuSE-Code-11-SP2-Branch/qt: VERSION.cmake package/yast2-qt.changes src/YQTable.cc
by tgoettlicher＠svn2.opensuse.org 23 Feb '12

23 Feb '12

Author: tgoettlicher Date: Thu Feb 23 15:15:56 2012 New Revision: 67536 URL: http://svn.opensuse.org/viewcvs/yast?rev=67536&view=rev Log: fixed selection Modified: branches/SuSE-Code-11-SP2-Branch/qt/VERSION.cmake branches/SuSE-Code-11-SP2-Branch/qt/package/yast2-qt.changes branches/SuSE-Code-11-SP2-Branch/qt/src/YQTable.cc Modified: branches/SuSE-Code-11-SP2-Branch/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/qt/VE… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/qt/VERSION.cmake (original) +++ branches/SuSE-Code-11-SP2-Branch/qt/VERSION.cmake Thu Feb 23 15:15:56 2012 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "6") +SET(VERSION_PATCH "7") Modified: branches/SuSE-Code-11-SP2-Branch/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/qt/pa… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/qt/package/yast2-qt.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/qt/package/yast2-qt.changes Thu Feb 23 15:15:56 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Feb 23 15:15:07 CET 2012 - tgoettlicher(a)suse.de + +- Fixed selection in Table widget (bnc#746156) +- V 2.21.7 + +------------------------------------------------------------------- Fri Feb 17 16:27:15 CET 2012 - tgoettlicher(a)suse.de - Fixed selection and sorting in Table widget (bnc#746156) Modified: branches/SuSE-Code-11-SP2-Branch/qt/src/YQTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/qt/sr… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/qt/src/YQTable.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/qt/src/YQTable.cc Thu Feb 23 15:15:56 2012 @@ -295,7 +295,7 @@ void YQTable::slotSelected( QTreeWidgetItem * listViewItem ) { - if ( listViewItem && listViewItem->isSelected() ) + if ( listViewItem && _qt_listView->selectedItems().count() > 0 ) selectOrigItem( listViewItem ); else { -- 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] r67535 - in /trunk/qt: VERSION.cmake package/yast2-qt.changes src/YQTable.cc
by tgoettlicher＠svn2.opensuse.org 23 Feb '12

23 Feb '12

Author: tgoettlicher Date: Thu Feb 23 15:13:39 2012 New Revision: 67535 URL: http://svn.opensuse.org/viewcvs/yast?rev=67535&view=rev Log: Fixed bnc#746156 Modified: trunk/qt/VERSION.cmake trunk/qt/package/yast2-qt.changes trunk/qt/src/YQTable.cc Modified: trunk/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION.cmake?rev=67535&r1=67… ============================================================================== --- trunk/qt/VERSION.cmake (original) +++ trunk/qt/VERSION.cmake Thu Feb 23 15:13:39 2012 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "22") -SET(VERSION_PATCH "3") +SET(VERSION_PATCH "4") 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 Thu Feb 23 15:13:39 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Feb 23 15:12:05 CET 2012 - tgoettlicher(a)suse.de + +- Fixed selection Table widget (bnc#746156) +- Version: 2.22.4 + +------------------------------------------------------------------- Fri Feb 17 16:17:32 CET 2012 - tgoettlicher(a)suse.de - Fixed selection and sorting in Table widget (bnc#746156) Modified: trunk/qt/src/YQTable.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQTable.cc?rev=67535&r1=6… ============================================================================== --- trunk/qt/src/YQTable.cc (original) +++ trunk/qt/src/YQTable.cc Thu Feb 23 15:13:39 2012 @@ -296,7 +296,7 @@ void YQTable::slotSelected( QTreeWidgetItem * listViewItem ) { - if ( listViewItem && listViewItem->isSelected() ) + if ( listViewItem && _qt_listView->selectedItems().count() > 0 ) selectOrigItem( listViewItem ); else { -- 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] r67534 - /tags/stable-2_22_3/network/
by mfilka＠svn2.opensuse.org 23 Feb '12

23 Feb '12

Author: mfilka Date: Thu Feb 23 11:37:41 2012 New Revision: 67534 URL: http://svn.opensuse.org/viewcvs/yast?rev=67534&view=rev Log: Created tag stable-2_22_3 for network Added: tags/stable-2_22_3/network/ (props changed) - copied from r67533, trunk/network/ -- 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] r67533 - in /trunk/network: VERSION package/yast2-network.changes src/clients/proxy.ycp src/clients/save_network.ycp src/services/proxy.ycp testsuite/tests/runtime.ycp
by mfilka＠svn2.opensuse.org 23 Feb '12

23 Feb '12

Author: mfilka Date: Thu Feb 23 11:37:07 2012 New Revision: 67533 URL: http://svn.opensuse.org/viewcvs/yast?rev=67533&view=rev Log: - added popup with security question when proxy url contains password (http://usr:pass@proxy) - bnc 694582 - fixed testsuite - 2.22.3 Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/clients/proxy.ycp trunk/network/src/clients/save_network.ycp trunk/network/src/services/proxy.ycp trunk/network/testsuite/tests/runtime.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=67533&r1=675… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Thu Feb 23 11:37:07 2012 @@ -1 +1 @@ -2.22.2 +2.22.3 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Thu Feb 23 11:37:07 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Feb 23 08:52:06 UTC 2012 - mfilka(a)suse.com + +- added popup with security question when proxy url contains password (http://usr:pass@proxy) - bnc 694582 +- fixed testsuite +- 2.22.3 + +------------------------------------------------------------------- Tue Jan 31 17:36:27 CET 2012 - mvidner(a)suse.cz - Simplified NetworkStorage::isDiskOnNetwork, thx locilka (bnc#726057#c12) Modified: trunk/network/src/clients/proxy.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/proxy.ycp?re… ============================================================================== --- trunk/network/src/clients/proxy.ycp (original) +++ trunk/network/src/clients/proxy.ycp Thu Feb 23 11:37:07 2012 @@ -44,10 +44,10 @@ /* main ui function */ any ret = ProxyMainDialog(true); y2debug("ret == %1", ret); - + if (ret == `next && Modified ()) Proxy::Write(); - + UI::CloseDialog(); return ret; Modified: trunk/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/save_network… ============================================================================== --- trunk/network/src/clients/save_network.ycp (original) +++ trunk/network/src/clients/save_network.ycp Thu Feb 23 11:37:07 2012 @@ -45,14 +45,14 @@ * @return true on success */ define boolean ReadInstallInfItem(path install_inf, string item, string var) { - if(item == nil || item == "" || var == nil || var == "") + if(item == nil || item == "" || var == nil || var == "") return false; string val = (string) SCR::Read(add(install_inf, var)); - if(val == nil) + if(val == nil) return false; - if(val != "") + if(val != "") InstallInf[item] = val; return true; Modified: trunk/network/src/services/proxy.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/services/proxy.ycp?r… ============================================================================== --- trunk/network/src/services/proxy.ycp (original) +++ trunk/network/src/services/proxy.ycp Thu Feb 23 11:37:07 2012 @@ -336,6 +336,13 @@ return validate; } + +boolean UrlContainPassword( string url) +{ + map ret = URL::Parse( url); + + return size( ret[ "pass"]:"") > 0 ; +} /** * Proxy dialog * @param standalone true if not run from another ycp client @@ -481,8 +488,8 @@ UI::ChangeWidget(`id(`user), `ValidChars, ValidCharsUsername); UI::ChangeWidget(`id(`frame1), `Enabled, enabled); UI::ChangeWidget(`id(`frame2), `Enabled, enabled); - if ( !Mode::installation() ) - UI::ChangeWidget(`id("test_proxy"), `Enabled, enabled) ; + if ( !Mode::installation() ) + UI::ChangeWidget(`id("test_proxy"), `Enabled, enabled) ; InitSameProxy(); if(enabled == true) UI::SetFocus(`id(`http)); @@ -520,16 +527,30 @@ if(https == prefill) https = ""; if(ftp == prefill) ftp = ""; - if(enabled == false) - break; - else { - if((http == "") && (https == "") && (ftp == "") ){ - /* Popup error text - http, https and ftp proxy URLs are blank */ - if(!Popup::ContinueCancel(_("Proxy is enabled, but no proxy URL has been specified. + if(enabled == false) + break; + if((http == "") && (https == "") && (ftp == "") ){ + /* Popup error text - http, https and ftp proxy URLs are blank */ + if(!Popup::ContinueCancel(_("Proxy is enabled, but no proxy URL has been specified. +Really use these settings?"))) + continue; + } + // bnc#694582 - username and password in URL + else + { + boolean password_inside = UrlContainPassword( http) || + UrlContainPassword( https) || + UrlContainPassword( ftp); + + if( (password_inside) && ( ret != "test_proxy")) + { + if(!Popup::ContinueCancel(_("Security warning: +Username and password will be stored unencrypted +in a worldwide readable plaintext file. Really use these settings?"))) - continue; - } - } + continue; + } + } /* check_* */ if(user == "" && pass != "") { /* Popup::Error text */ Modified: trunk/network/testsuite/tests/runtime.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/testsuite/tests/runtime.… ============================================================================== --- trunk/network/testsuite/tests/runtime.ycp (original) +++ trunk/network/testsuite/tests/runtime.ycp Thu Feb 23 11:37:07 2012 @@ -32,6 +32,7 @@ ], "target" : $[ "size" : 1, + "stat" : $[ "dummy": true ] ], ]; -- 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] r67532 - in /trunk/s390/src: dasd/wizards.ycp zfcp/wizards.ycp
by aschnell＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: aschnell Date: Wed Feb 22 18:13:01 2012 New Revision: 67532 URL: http://svn.opensuse.org/viewcvs/yast?rev=67532&view=rev Log: - stricter types Modified: trunk/s390/src/dasd/wizards.ycp trunk/s390/src/zfcp/wizards.ycp Modified: trunk/s390/src/dasd/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/wizards.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/wizards.ycp (original) +++ trunk/s390/src/dasd/wizards.ycp Wed Feb 22 18:13:01 2012 @@ -53,7 +53,7 @@ * Whole configuration of controller * @return sequence result */ -any DASDSequence() +symbol DASDSequence() { map aliases = $[ "read" : [ ``(ReadDialog()), true ], @@ -80,7 +80,7 @@ Wizard::CreateDialog(); Wizard::SetDesktopIcon("dasd"); - any ret = Sequencer::Run(aliases, sequence); + symbol ret = Sequencer::Run(aliases, sequence); Wizard::CloseDialog(); @@ -93,7 +93,7 @@ * For use with autoinstallation. * @return sequence result */ -any DASDAutoSequence() +symbol DASDAutoSequence() { /* Initialization dialog caption */ string caption = _("Controller Configuration"); @@ -105,7 +105,7 @@ Wizard::SetContentsButtons(caption, contents, "", Label::BackButton(), Label::NextButton()); - any ret = MainDASDSequence(); + symbol ret = MainDASDSequence(); Wizard::CloseDialog(); Modified: trunk/s390/src/zfcp/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/wizards.ycp?rev=67… ============================================================================== --- trunk/s390/src/zfcp/wizards.ycp (original) +++ trunk/s390/src/zfcp/wizards.ycp Wed Feb 22 18:13:01 2012 @@ -53,12 +53,12 @@ * Whole configuration of controller * @return sequence result */ -any ZFCPSequence() +symbol ZFCPSequence() { map aliases = $[ - "read" : [ ``( ReadDialog() ), true ], - "main" : ``( MainZFCPSequence() ), - "write" : [ ``( WriteDialog() ), true ] + "read" : [ ``(ReadDialog()), true ], + "main" : ``(MainZFCPSequence()), + "write" : [ ``(WriteDialog()), true ] ]; map sequence = $[ @@ -80,7 +80,7 @@ Wizard::CreateDialog(); Wizard::SetDesktopIcon("zfcp"); - any ret = Sequencer::Run(aliases, sequence); + symbol ret = Sequencer::Run(aliases, sequence); Wizard::CloseDialog(); @@ -93,7 +93,7 @@ * For use with autoinstallation. * @return sequence result */ -any ZFCPAutoSequence() +symbol ZFCPAutoSequence() { /* Initialization dialog caption */ string caption = _("Controller Configuration"); @@ -105,7 +105,7 @@ Wizard::SetContentsButtons(caption, contents, "", Label::BackButton(), Label::NextButton()); - any ret = MainZFCPSequence(); + symbol ret = MainZFCPSequence(); Wizard::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] r67531 - in /trunk/s390/src/modules: DASDController.ycp ZFCPController.ycp
by aschnell＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: aschnell Date: Wed Feb 22 17:46:51 2012 New Revision: 67531 URL: http://svn.opensuse.org/viewcvs/yast?rev=67531&view=rev Log: - removed apparently unused functions Modified: trunk/s390/src/modules/DASDController.ycp trunk/s390/src/modules/ZFCPController.ycp 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 Wed Feb 22 17:46:51 2012 @@ -54,25 +54,6 @@ /** - * Abort function - * return boolean return true if abort - */ -global boolean() AbortFunction = GetModified; - - -/** - * Abort function - * @return blah blah lahjk - */ -global boolean Abort() -{ - if(AbortFunction != nil) - return AbortFunction (); - return false; -} - - -/** * Data was modified? * @return true if modified */ 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 Wed Feb 22 17:46:51 2012 @@ -51,24 +51,6 @@ /** - * Abort function - * return boolean return true if abort - */ -global boolean() AbortFunction = GetModified; - - -/** - * Abort function - * @return blah blah lahjk - */ -global boolean Abort() -{ - if(AbortFunction != nil) - return AbortFunction (); - return false; -} - -/** * Data was modified? * @return true if modified */ -- 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] r67530 - in /trunk/s390/src/modules: DASDController.ycp ZFCPController.ycp
by aschnell＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: aschnell Date: Wed Feb 22 17:33:18 2012 New Revision: 67530 URL: http://svn.opensuse.org/viewcvs/yast?rev=67530&view=rev Log: - removed mostly usless checks - fixed map lockup Modified: trunk/s390/src/modules/DASDController.ycp trunk/s390/src/modules/ZFCPController.ycp 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 Wed Feb 22 17:33:18 2012 @@ -71,6 +71,7 @@ return false; } + /** * Data was modified? * @return true if modified @@ -112,7 +113,7 @@ string regexp = "^([0-9a-fA-F]{1}).([0-9a-fA-F]{1}).([0-9a-fA-F]{1,4})$"; return regexpmatch(channel, regexp); } - + global string FormatChannel(string channel) { if (!IsValidChannel(channel)) @@ -193,6 +194,8 @@ y2milestone("Exit code: %1", ret); UI::CloseDialog(); + + disk_configured = false; } } @@ -264,12 +267,6 @@ 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"]:"", "."); integer tmp_css = tointeger("0x" + tmp_strs[0]:""); @@ -279,7 +276,6 @@ 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; } @@ -352,7 +348,7 @@ disks = filter (map<string,any> d, disks, { return tolower(d["device"]:"") == "dasd"; }); integer count = size (disks); - y2milestone ("Detected %1 DASD disks", count); + y2milestone("number of probed DASD devices %1", count); return count > 0; } 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 Wed Feb 22 17:33:18 2012 @@ -44,6 +44,7 @@ */ global boolean modified = false; + /** */ global boolean proposal_valid = false; @@ -202,6 +203,8 @@ y2milestone("Exit code: %1", ret); UI::CloseDialog(); + + disk_configured = false; } } @@ -274,14 +277,8 @@ 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"]:"", "."); + list<string> tmp_strs = splitstring(d["detail", "controller_id"]:"", "."); integer tmp_css = tointeger("0x" + tmp_strs[0]:""); integer tmp_lcss = tointeger("0x" + tmp_strs[1]:""); integer tmp_chan = tointeger("0x" + tmp_strs[2]:""); @@ -289,7 +286,6 @@ 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; } -- 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] r67529 - /tags/stable-2_22_5/ldap-client/
by jsuchome＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: jsuchome Date: Wed Feb 22 16:40:17 2012 New Revision: 67529 URL: http://svn.opensuse.org/viewcvs/yast?rev=67529&view=rev Log: Created tag stable-2_22_5 for ldap-client Added: tags/stable-2_22_5/ldap-client/ - copied from r67528, trunk/ldap-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] r67528 - /tags/stable-2_22_5/
by jsuchome＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: jsuchome Date: Wed Feb 22 16:40:02 2012 New Revision: 67528 URL: http://svn.opensuse.org/viewcvs/yast?rev=67528&view=rev Log: Created tag stable-2_22_5 Added: tags/stable-2_22_5/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0