October 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r66611 - /tags/stable-2_21_8/s390/
by thardeck＠svn2.opensuse.org 26 Oct '11

26 Oct '11

Author: thardeck Date: Wed Oct 26 16:43:58 2011 New Revision: 66611 URL: http://svn.opensuse.org/viewcvs/yast?rev=66611&view=rev Log: Created tag stable-2_21_8 for s390 Added: tags/stable-2_21_8/s390/ - copied from r66610, trunk/s390/ -- 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] r66610 - in /trunk/s390: VERSION package/yast2-s390.changes src/iucvterminal-server/ui.ycp src/iucvterminal/ui.ycp src/modules/IUCVTerminalServer.ycp src/modules/OnPanic.ycp src/onpanic/ui.ycp
by thardeck＠svn2.opensuse.org 26 Oct '11

26 Oct '11

Author: thardeck Date: Wed Oct 26 16:43:48 2011 New Revision: 66610 URL: http://svn.opensuse.org/viewcvs/yast?rev=66610&view=rev Log: - fixed POSIX regex expressions Modified: trunk/s390/VERSION trunk/s390/package/yast2-s390.changes trunk/s390/src/iucvterminal-server/ui.ycp trunk/s390/src/iucvterminal/ui.ycp trunk/s390/src/modules/IUCVTerminalServer.ycp trunk/s390/src/modules/OnPanic.ycp trunk/s390/src/onpanic/ui.ycp Modified: trunk/s390/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/VERSION?rev=66610&r1=66609&… ============================================================================== --- trunk/s390/VERSION (original) +++ trunk/s390/VERSION Wed Oct 26 16:43:48 2011 @@ -1 +1 @@ -2.21.7 +2.21.8 Modified: trunk/s390/package/yast2-s390.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/package/yast2-s390.changes?… ============================================================================== --- trunk/s390/package/yast2-s390.changes (original) +++ trunk/s390/package/yast2-s390.changes Wed Oct 26 16:43:48 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Oct 26 16:06:33 EDT 2011 - thardeck(a)suse.com + +- fixed POSIX regex expressions + +------------------------------------------------------------------- Mon Oct 24 15:05:56 EDT 2011 - thardeck(a)suse.com - fixed some help texts (bnc#724622) Modified: trunk/s390/src/iucvterminal-server/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/iucvterminal-server/ui.… ============================================================================== --- trunk/s390/src/iucvterminal-server/ui.ycp (original) +++ trunk/s390/src/iucvterminal-server/ui.ycp Wed Oct 26 16:43:48 2011 @@ -754,19 +754,19 @@ integer line = 0; foreach (string zvmid, zvmid_list,{ line = line + 1; - if (regexpmatch(zvmid, "[^:alnum:]")) + if (regexpmatch(zvmid, "[^[:alnum:]]")) { Popup::Notify(sformat(_("Wrong z/VM ID \"%1\" in line %2, only letters and numbers are allowed."), zvmid, line)); ret = false; break; } - else if (regexpmatch(zvmid, "^[:digit:]")) + else if (regexpmatch(zvmid, "^[[:digit:]]")) { Popup::Notify(sformat(_("Wrong z/VM ID \"%1\" in line %2, numbers at the beginning are not allowed."), zvmid, line)); ret = false; break; } - else if (regexpmatch(zvmid, "[:lower::digit:]{9,}")) + else if (regexpmatch(zvmid, "[[:lower:][:digit:]]{9,}")) { Popup::Notify(sformat(_("Wrong z/VM ID \"%1\" in line %2, more than eight characters are not allowed."), zvmid, line)); ret = false; Modified: trunk/s390/src/iucvterminal/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/iucvterminal/ui.ycp?rev… ============================================================================== --- trunk/s390/src/iucvterminal/ui.ycp (original) +++ trunk/s390/src/iucvterminal/ui.ycp Wed Oct 26 16:43:48 2011 @@ -91,7 +91,7 @@ boolean ret = false; string restrict_hvc_to_srvs = (string)UI::QueryWidget (`id (`restrict_hvc_to_srvs), `Value); - if (regexpmatch(restrict_hvc_to_srvs, "[^:lower::digit:,]")) + if (regexpmatch(restrict_hvc_to_srvs, "[^[:lower:][:digit:],]")) { Popup::Notify(_("Wrong input, only lower case letters, numbers and for separation commas are allowed.")); } @@ -99,7 +99,7 @@ { Popup::Notify(_("Comma is only a separator.")); } - else if (regexpmatch(restrict_hvc_to_srvs, "[:lower::digit:]{9,}")) + else if (regexpmatch(restrict_hvc_to_srvs, "[[:lower:][:digit:]]{9,}")) { Popup::Notify(_("z/VM IDs doesn't allow more than eight characters.")); } @@ -122,7 +122,7 @@ boolean ret = false; string iucv_name = (string)UI::QueryWidget (`id (`iucv_name), `Value); - if (regexpmatch(iucv_name, "[^:lower::digit:]")) + if (regexpmatch(iucv_name, "[^[:lower:][:digit:]]")) { Popup::Notify(_("Wrong IUCV ID, only lower case letters are allowed.")); } Modified: trunk/s390/src/modules/IUCVTerminalServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/IUCVTerminalSer… ============================================================================== --- trunk/s390/src/modules/IUCVTerminalServer.ycp (original) +++ trunk/s390/src/modules/IUCVTerminalServer.ycp Wed Oct 26 16:43:48 2011 @@ -518,7 +518,7 @@ } // ignore empty entries(like "list:" or "regex:") - if (!regexpmatch(value, "^[:lower:]{4,5}:$")) + if (!regexpmatch(value, "^[[:lower:]]{4,5}:$")) { ts_auth_values = add(ts_auth_values, name, value); } Modified: trunk/s390/src/modules/OnPanic.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/OnPanic.ycp?rev… ============================================================================== --- trunk/s390/src/modules/OnPanic.ycp (original) +++ trunk/s390/src/modules/OnPanic.ycp Wed Oct 26 16:43:48 2011 @@ -86,8 +86,8 @@ map dev = $[ ]; list<string> entry = splitstring(dev_line, "\t"); - boolean is_dasd = regexpmatch(entry[0]:nil, "^\/dev\/dasd[:lower:]+$"); - boolean is_zfcp = regexpmatch(entry[0]:nil, "^\/dev\/sd[:lower:]+$"); + boolean is_dasd = regexpmatch(entry[0]:nil, "^\/dev\/dasd[[:lower:]]+$"); + boolean is_zfcp = regexpmatch(entry[0]:nil, "^\/dev\/sd[[:lower:]]+$"); if (is_dasd) { @@ -123,10 +123,10 @@ foreach (string entry, dump_devices,{ list<string> line = splitstring(entry, "\t"); if ( // check for fitting dasd - (type == "ccw" && regexpmatch(line[0]:nil, "^\/dev\/dasd[:lower:]+") + (type == "ccw" && regexpmatch(line[0]:nil, "^\/dev\/dasd[[:lower:]]+") && line[2]:nil == dev["DEVICE"]:nil) || // check for fitting zfcp - (type == "fcp" && regexpmatch(line[0]:nil, "^\/dev\/sd[:lower:]+") + (type == "fcp" && regexpmatch(line[0]:nil, "^\/dev\/sd[[:lower:]]+") && line[2]:nil == dev["DEVICE"]:nil && line[3]:nil == dev["WWPN"]:nil && line[4]:nil == dev["LUN"]:nil) Modified: trunk/s390/src/onpanic/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/onpanic/ui.ycp?rev=6661… ============================================================================== --- trunk/s390/src/onpanic/ui.ycp (original) +++ trunk/s390/src/onpanic/ui.ycp Wed Oct 26 16:43:48 2011 @@ -191,7 +191,7 @@ // don't allow vmcmd without at least one command if ((string) UI::QueryWidget (`id (`onpanic), `Value) == "vmcmd" - && !regexpmatch((string) UI::QueryWidget (`id (`vmcmd), `Value), "[:alpha:]{2,}")) + && !regexpmatch((string) UI::QueryWidget (`id (`vmcmd), `Value), "[[:alpha:]]{2,}")) { Popup::Notify (_("It is not possible to use vmcmd without defining at least one command.")); ret = `again; -- 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] r66609 - /tags/branch-Code-11-SP2-2_17_26/s390/
by thardeck＠svn2.opensuse.org 26 Oct '11

26 Oct '11

Author: thardeck Date: Wed Oct 26 16:19:36 2011 New Revision: 66609 URL: http://svn.opensuse.org/viewcvs/yast?rev=66609&view=rev Log: Created tag branch-Code-11-SP2-2_17_26 for s390 Added: tags/branch-Code-11-SP2-2_17_26/s390/ (props changed) - copied from r66608, branches/SuSE-Code-11-SP2-Branch/s390/ -- 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] r66608 - in /branches/SuSE-Code-11-SP2-Branch/s390: ./ package/ src/iucvterminal-server/ src/iucvterminal/ src/modules/ src/onpanic/
by thardeck＠svn2.opensuse.org 26 Oct '11

26 Oct '11

Author: thardeck Date: Wed Oct 26 16:19:20 2011 New Revision: 66608 URL: http://svn.opensuse.org/viewcvs/yast?rev=66608&view=rev Log: - fixed POSIX regex expressions Modified: branches/SuSE-Code-11-SP2-Branch/s390/VERSION branches/SuSE-Code-11-SP2-Branch/s390/package/yast2-s390.changes branches/SuSE-Code-11-SP2-Branch/s390/src/iucvterminal-server/ui.ycp branches/SuSE-Code-11-SP2-Branch/s390/src/iucvterminal/ui.ycp branches/SuSE-Code-11-SP2-Branch/s390/src/modules/IUCVTerminalServer.ycp branches/SuSE-Code-11-SP2-Branch/s390/src/modules/OnPanic.ycp branches/SuSE-Code-11-SP2-Branch/s390/src/onpanic/ui.ycp Modified: branches/SuSE-Code-11-SP2-Branch/s390/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/VERSION Wed Oct 26 16:19:20 2011 @@ -1 +1 @@ -2.17.25 +2.17.26 Modified: branches/SuSE-Code-11-SP2-Branch/s390/package/yast2-s390.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/package/yast2-s390.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/package/yast2-s390.changes Wed Oct 26 16:19:20 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Oct 26 16:06:33 EDT 2011 - thardeck(a)suse.com + +- fixed POSIX regex expressions + +------------------------------------------------------------------- Mon Oct 24 15:05:56 EDT 2011 - thardeck(a)suse.com - fixed some help texts (bnc#724622) Modified: branches/SuSE-Code-11-SP2-Branch/s390/src/iucvterminal-server/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/src/iucvterminal-server/ui.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/src/iucvterminal-server/ui.ycp Wed Oct 26 16:19:20 2011 @@ -754,19 +754,19 @@ integer line = 0; foreach (string zvmid, zvmid_list,{ line = line + 1; - if (regexpmatch(zvmid, "[^:alnum:]")) + if (regexpmatch(zvmid, "[^[:alnum:]]")) { Popup::Notify(sformat(_("Wrong z/VM ID \"%1\" in line %2, only letters and numbers are allowed."), zvmid, line)); ret = false; break; } - else if (regexpmatch(zvmid, "^[:digit:]")) + else if (regexpmatch(zvmid, "^[[:digit:]]")) { Popup::Notify(sformat(_("Wrong z/VM ID \"%1\" in line %2, numbers at the beginning are not allowed."), zvmid, line)); ret = false; break; } - else if (regexpmatch(zvmid, "[:lower::digit:]{9,}")) + else if (regexpmatch(zvmid, "[[:lower:][:digit:]]{9,}")) { Popup::Notify(sformat(_("Wrong z/VM ID \"%1\" in line %2, more than eight characters are not allowed."), zvmid, line)); ret = false; Modified: branches/SuSE-Code-11-SP2-Branch/s390/src/iucvterminal/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/src/iucvterminal/ui.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/src/iucvterminal/ui.ycp Wed Oct 26 16:19:20 2011 @@ -91,7 +91,7 @@ boolean ret = false; string restrict_hvc_to_srvs = (string)UI::QueryWidget (`id (`restrict_hvc_to_srvs), `Value); - if (regexpmatch(restrict_hvc_to_srvs, "[^:lower::digit:,]")) + if (regexpmatch(restrict_hvc_to_srvs, "[^[:lower:][:digit:],]")) { Popup::Notify(_("Wrong input, only lower case letters, numbers and for separation commas are allowed.")); } @@ -99,7 +99,7 @@ { Popup::Notify(_("Comma is only a separator.")); } - else if (regexpmatch(restrict_hvc_to_srvs, "[:lower::digit:]{9,}")) + else if (regexpmatch(restrict_hvc_to_srvs, "[[:lower:][:digit:]]{9,}")) { Popup::Notify(_("z/VM IDs doesn't allow more than eight characters.")); } @@ -122,7 +122,7 @@ boolean ret = false; string iucv_name = (string)UI::QueryWidget (`id (`iucv_name), `Value); - if (regexpmatch(iucv_name, "[^:lower::digit:]")) + if (regexpmatch(iucv_name, "[^[:lower:][:digit:]]")) { Popup::Notify(_("Wrong IUCV ID, only lower case letters are allowed.")); } Modified: branches/SuSE-Code-11-SP2-Branch/s390/src/modules/IUCVTerminalServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/src/modules/IUCVTerminalServer.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/src/modules/IUCVTerminalServer.ycp Wed Oct 26 16:19:20 2011 @@ -518,7 +518,7 @@ } // ignore empty entries(like "list:" or "regex:") - if (!regexpmatch(value, "^[:lower:]{4,5}:$")) + if (!regexpmatch(value, "^[[:lower:]]{4,5}:$")) { ts_auth_values = add(ts_auth_values, name, value); } Modified: branches/SuSE-Code-11-SP2-Branch/s390/src/modules/OnPanic.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/src/modules/OnPanic.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/src/modules/OnPanic.ycp Wed Oct 26 16:19:20 2011 @@ -86,8 +86,8 @@ map dev = $[ ]; list<string> entry = splitstring(dev_line, "\t"); - boolean is_dasd = regexpmatch(entry[0]:nil, "^\/dev\/dasd[:lower:]+$"); - boolean is_zfcp = regexpmatch(entry[0]:nil, "^\/dev\/sd[:lower:]+$"); + boolean is_dasd = regexpmatch(entry[0]:nil, "^\/dev\/dasd[[:lower:]]+$"); + boolean is_zfcp = regexpmatch(entry[0]:nil, "^\/dev\/sd[[:lower:]]+$"); if (is_dasd) { @@ -123,10 +123,10 @@ foreach (string entry, dump_devices,{ list<string> line = splitstring(entry, "\t"); if ( // check for fitting dasd - (type == "ccw" && regexpmatch(line[0]:nil, "^\/dev\/dasd[:lower:]+") + (type == "ccw" && regexpmatch(line[0]:nil, "^\/dev\/dasd[[:lower:]]+") && line[2]:nil == dev["DEVICE"]:nil) || // check for fitting zfcp - (type == "fcp" && regexpmatch(line[0]:nil, "^\/dev\/sd[:lower:]+") + (type == "fcp" && regexpmatch(line[0]:nil, "^\/dev\/sd[[:lower:]]+") && line[2]:nil == dev["DEVICE"]:nil && line[3]:nil == dev["WWPN"]:nil && line[4]:nil == dev["LUN"]:nil) Modified: branches/SuSE-Code-11-SP2-Branch/s390/src/onpanic/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/src/onpanic/ui.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/src/onpanic/ui.ycp Wed Oct 26 16:19:20 2011 @@ -191,7 +191,7 @@ // don't allow vmcmd without at least one command if ((string) UI::QueryWidget (`id (`onpanic), `Value) == "vmcmd" - && !regexpmatch((string) UI::QueryWidget (`id (`vmcmd), `Value), "[:alpha:]{2,}")) + && !regexpmatch((string) UI::QueryWidget (`id (`vmcmd), `Value), "[[:alpha:]]{2,}")) { Popup::Notify (_("It is not possible to use vmcmd without defining at least one command.")); ret = `again; -- 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] r66607 - in /trunk/iscsi-client: package/yast2-iscsi-client.changes src/IscsiClientLib.ycp
by fehr＠svn2.opensuse.org 26 Oct '11

26 Oct '11

Author: fehr Date: Wed Oct 26 15:28:48 2011 New Revision: 66607 URL: http://svn.opensuse.org/viewcvs/yast?rev=66607&view=rev Log: adapt to changed output if iscsi_offload script (bnc#725833) Modified: trunk/iscsi-client/package/yast2-iscsi-client.changes trunk/iscsi-client/src/IscsiClientLib.ycp Modified: trunk/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/package/yast2-iscsi… ============================================================================== --- trunk/iscsi-client/package/yast2-iscsi-client.changes (original) +++ trunk/iscsi-client/package/yast2-iscsi-client.changes Wed Oct 26 15:28:48 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Oct 26 15:26:38 CEST 2011 - fehr(a)suse.de + +- adapt to changed output if iscsi_offload script (bnc#725833) + +------------------------------------------------------------------- Thu Oct 20 14:57:42 CEST 2011 - fehr(a)suse.de - 2.21.7 Modified: trunk/iscsi-client/src/IscsiClientLib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/IscsiClientLib.… ============================================================================== --- trunk/iscsi-client/src/IscsiClientLib.ycp (original) +++ trunk/iscsi-client/src/IscsiClientLib.ycp Wed Oct 26 15:28:48 2011 @@ -709,7 +709,7 @@ { offload_valid[i] = filter( list l, (list<list>)eth, { - cmd = offboard_script + " " + l[0]:""; + cmd = offboard_script + " " + l[0]:"" + " | grep ..:..:..:.."; y2milestone( "GetOffloadItems cmd:%1", cmd ); map out = (map) SCR::Execute (.target.bash_output, cmd ); y2milestone( "GetOffloadItems iscsi_offload out:%1", out ); -- 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] r66606 - in /branches/SuSE-Code-11-SP2-Branch/iscsi-client: package/yast2-iscsi-client.changes src/IscsiClientLib.ycp
by fehr＠svn2.opensuse.org 26 Oct '11

26 Oct '11

Author: fehr Date: Wed Oct 26 15:28:10 2011 New Revision: 66606 URL: http://svn.opensuse.org/viewcvs/yast?rev=66606&view=rev Log: adapt to changed output if iscsi_offload script (bnc#725833) Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes Wed Oct 26 15:28:10 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Oct 26 15:26:38 CEST 2011 - fehr(a)suse.de + +- adapt to changed output if iscsi_offload script (bnc#725833) + +------------------------------------------------------------------- Thu Oct 20 14:57:42 CEST 2011 - fehr(a)suse.de - 2.17.28 Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp Wed Oct 26 15:28:10 2011 @@ -710,7 +710,7 @@ { offload_valid[i] = filter( list l, (list<list>)eth, { - cmd = offboard_script + " " + l[0]:""; + cmd = offboard_script + " " + l[0]:"" + " | grep ..:..:..:.."; y2milestone( "GetOffloadItems cmd:%1", cmd ); map out = (map) SCR::Execute (.target.bash_output, cmd ); y2milestone( "GetOffloadItems iscsi_offload out:%1", out ); -- 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] r66605 - /tags/branch-Code-11-SP2-2_17_115/yast2/
by lslezak＠svn2.opensuse.org 26 Oct '11

26 Oct '11

Author: lslezak Date: Wed Oct 26 15:17:24 2011 New Revision: 66605 URL: http://svn.opensuse.org/viewcvs/yast?rev=66605&view=rev Log: Created tag branch-Code-11-SP2-2_17_115 for yast2 Added: tags/branch-Code-11-SP2-2_17_115/yast2/ (props changed) - copied from r66604, branches/SuSE-Code-11-SP2-Branch/yast2/ -- 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] r66604 - in /branches/SuSE-Code-11-SP2-Branch/yast2: VERSION library/packages/src/PackagesUI.ycp package/yast2.changes
by lslezak＠svn2.opensuse.org 26 Oct '11

26 Oct '11

Author: lslezak Date: Wed Oct 26 15:17:18 2011 New Revision: 66604 URL: http://svn.opensuse.org/viewcvs/yast?rev=66604&view=rev Log: - PackagesUI.ycp - fixed translations in the pattern selection dialog - removed obsoleted text domain switch (bnc#445716) - 2.17.115 Modified: branches/SuSE-Code-11-SP2-Branch/yast2/VERSION branches/SuSE-Code-11-SP2-Branch/yast2/library/packages/src/PackagesUI.ycp branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes Modified: branches/SuSE-Code-11-SP2-Branch/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/VERSION Wed Oct 26 15:17:18 2011 @@ -1 +1 @@ -2.17.114 +2.17.115 Modified: branches/SuSE-Code-11-SP2-Branch/yast2/library/packages/src/PackagesUI.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/library/packages/src/PackagesUI.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/library/packages/src/PackagesUI.ycp Wed Oct 26 15:17:18 2011 @@ -257,9 +257,6 @@ return RunPackageSelector($[]); // Fallback: detailed selection } - // TODO FIXME: due to the textfreeze "base" cannot be used now, fix it after the GM is out! - textdomain "packager"; - // Help text for software patterns / selections dialog string help_text = _("<p> @@ -301,9 +298,6 @@ false, // has_back true ); // has_next - // TODO FIXME: remove this - textdomain "base"; - Wizard::SetDesktopIcon( "sw_single" ); symbol result = nil; Modified: branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes Wed Oct 26 15:17:18 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Oct 26 13:12:56 UTC 2011 - lslezak(a)suse.cz + +- PackagesUI.ycp - fixed translations in the pattern selection + dialog - removed obsoleted text domain switch (bnc#445716) +- 2.17.115 + +------------------------------------------------------------------- Tue Oct 25 15:36:34 CEST 2011 - mvidner(a)suse.cz - Moved NetworkStorage from yast2.rpm to yast2-network.rpm -- 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] r66603 - /branches/SuSE-Code-11-SP2-Branch/network/yast2-network.spec.in
by mvidner＠svn2.opensuse.org 26 Oct '11

26 Oct '11

Author: mvidner Date: Wed Oct 26 15:15:06 2011 New Revision: 66603 URL: http://svn.opensuse.org/viewcvs/yast?rev=66603&view=rev Log: reformated with prepare_spec Modified: branches/SuSE-Code-11-SP2-Branch/network/yast2-network.spec.in Modified: branches/SuSE-Code-11-SP2-Branch/network/yast2-network.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/yast2-network.spec.in (original) +++ branches/SuSE-Code-11-SP2-Branch/network/yast2-network.spec.in Wed Oct 26 15:15:06 2011 @@ -1,46 +1,63 @@ +# +# spec file for package _ +# +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + @HEADER-COMMENT@ @HEADER@ # should be required by devtools -BuildRequires: pkgconfig perl-XML-Writer rpm -BuildRequires: update-desktop-files -BuildRequires: yast2-devtools yast2-testsuite -BuildRequires: yast2-country -BuildRequires: yast2-installation >= 2.15.27 +BuildRequires: perl-XML-Writer pkgconfig rpm +BuildRequires: update-desktop-files +BuildRequires: yast2-devtools yast2-testsuite +BuildRequires: yast2-country +BuildRequires: yast2-installation >= 2.15.27 # NetworkInterfaces::GetTypeFromIfcfg (bnc#572747) -BuildRequires: yast2 >= 2.17.96 -Requires: yast2 >= 2.17.96 +BuildRequires: yast2 >= 2.17.96 +Requires: yast2 >= 2.17.96 #netconfig (FaTE #303618) -Requires: sysconfig >= 0.71.2 +Requires: sysconfig >= 0.71.2 #GetLanguageCountry #(in newly created yast2-country-data) -Requires: yast2-country-data >= 2.16.3 +Requires: yast2-country-data >= 2.16.3 # Storage::IsDeviceOnNetwork BuildRequires: yast2-storage >= 2.17.118 Requires: yast2-storage >= 2.17.118 -PreReq: /bin/rm +PreReq: /bin/rm -Provides: y2c_lan y2c_dial yast2-config-adsl y2c_adsl -Obsoletes: y2c_lan y2c_dial yast2-config-adsl y2c_adsl -Provides: yast2-lib-network yast2-config-network -Obsoletes: yast2-lib-network yast2-config-network -Provides: yast2-trans-network yast2-trans-adsl -Obsoletes: yast2-trans-network yast2-trans-adsl -Provides: y2t_lan y2t_adsl y2t_dial -Obsoletes: y2t_lan y2t_adsl y2t_dial +Provides: y2c_lan y2c_dial yast2-config-adsl y2c_adsl +Obsoletes: y2c_lan y2c_dial yast2-config-adsl y2c_adsl +Provides: yast2-lib-network yast2-config-network +Obsoletes: yast2-lib-network yast2-config-network +Provides: yast2-trans-network yast2-trans-adsl +Obsoletes: yast2-trans-network yast2-trans-adsl +Provides: y2t_lan y2t_adsl y2t_dial +Obsoletes: y2t_lan y2t_adsl y2t_dial # carrier detection -Conflicts: yast2-core < 2.10.6 +Conflicts: yast2-core < 2.10.6 -Summary: Network configuration +Summary: Network configuration %package devel-doc Group: System/YaST -Summary: Developer documentation for yast2-network - +Summary: Developer documentation for yast2-network %description Network configuration @@ -98,3 +115,5 @@ %doc @docdir@ %exclude @docdir@/COPYING %exclude @docdir@/README + +%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] r66602 - in /branches/SuSE-Code-11-SP2-Branch/network: ./ package/ src/clients/ src/modules/ testsuite/tests/
by mvidner＠svn2.opensuse.org 26 Oct '11

26 Oct '11

Author: mvidner Date: Wed Oct 26 15:11:08 2011 New Revision: 66602 URL: http://svn.opensuse.org/viewcvs/yast?rev=66602&view=rev Log: Use Storage::IsDeviceOnNetwork instead of trying to do it ourselves, wrong (bnc#726057). But keep NetworkStorage::isDiskOnNetwork because of NFS, but change its API, symbols are more readable than integers. Deleted tests for the misimplementation :-/ Modified: branches/SuSE-Code-11-SP2-Branch/network/VERSION branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-SP2-Branch/network/src/clients/save_network.ycp branches/SuSE-Code-11-SP2-Branch/network/src/modules/Lan.ycp branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp branches/SuSE-Code-11-SP2-Branch/network/src/modules/NetworkStorage.ycp branches/SuSE-Code-11-SP2-Branch/network/testsuite/tests/NetworkStorage.out branches/SuSE-Code-11-SP2-Branch/network/testsuite/tests/NetworkStorage.ycp branches/SuSE-Code-11-SP2-Branch/network/testsuite/tests/Network_YaPI.out branches/SuSE-Code-11-SP2-Branch/network/testsuite/tests/Network_YaPI.ycp branches/SuSE-Code-11-SP2-Branch/network/yast2-network.spec.in Modified: branches/SuSE-Code-11-SP2-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/network/VERSION Wed Oct 26 15:11:08 2011 @@ -1 +1 @@ -2.17.162 +2.17.163 Modified: branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes Wed Oct 26 15:11:08 2011 @@ -3,6 +3,9 @@ - Moved NetworkStorage from yast2.rpm to yast2-network.rpm (bnc#726057) +- Use Storage::IsDeviceOnNetwork instead of trying to do it + ourselves, wrong (bnc#726057). +- 2.17.163 ------------------------------------------------------------------- Fri Sep 2 16:08:07 CEST 2011 - mvidner(a)suse.cz Modified: branches/SuSE-Code-11-SP2-Branch/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/src/clients/save_network.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/network/src/clients/save_network.ycp Wed Oct 26 15:11:08 2011 @@ -31,7 +31,7 @@ map <string, any> InstallInf = $[]; // global variable because chrooted environment -integer network_disk=0; +symbol network_disk = `no; // `nfs `iscsi `fcoe string netdevice=""; /** @@ -231,7 +231,7 @@ void CreateIfcfg() { string ifcfg=""; - if (network_disk==1 && contains(NetworkStorage::getiBFTDevices(), InstallInf["netdevice"]:"")){ + if (network_disk == `iscsi && contains(NetworkStorage::getiBFTDevices(), InstallInf["netdevice"]:"")){ ifcfg = sformat("%1STARTMODE='nfsroot'\nBOOTPROTO='ibft'\n", ifcfg); } else { @@ -257,10 +257,10 @@ SCR::Execute(.target.bash_output, "sed -i s/\"DHCLIENT_SET_HOSTNAME=.*\"/'DHCLIENT_SET_HOSTNAME=\"yes\"'/g /etc/sysconfig/network/dhcp"); } - if (network_disk == 0) { + if (network_disk == `no) { ifcfg = sformat("%1STARTMODE='onboot'\n", ifcfg); } - else if (network_disk > 0) { + else { ifcfg = sformat("%1STARTMODE='nfsroot'\n", ifcfg); } } Modified: branches/SuSE-Code-11-SP2-Branch/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/src/modules/Lan.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/network/src/modules/Lan.ycp Wed Oct 26 15:11:08 2011 @@ -26,7 +26,6 @@ import "NetworkConfig"; import "NetworkInterfaces"; import "NetworkService"; -//import "NetworkStorage"; import "Package"; import "ProductFeatures"; import "Routing"; Modified: branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp Wed Oct 26 15:11:08 2011 @@ -1540,7 +1540,7 @@ netmask = ""; bootproto = "dhcp"; // #176804 - if (NetworkStorage::isDiskOnNetwork ( NetworkStorage::getDevice("/") )>0) + if (NetworkStorage::isDiskOnNetwork ( NetworkStorage::getDevice("/") ) != `no) { startmode = "nfsroot"; y2milestone ("startmode nfsroot"); Modified: branches/SuSE-Code-11-SP2-Branch/network/src/modules/NetworkStorage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/src/modules/NetworkStorage.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/network/src/modules/NetworkStorage.ycp Wed Oct 26 15:11:08 2011 @@ -13,7 +13,7 @@ module "NetworkStorage"; -import "FileUtils"; +import "Storage"; /** * Ask /proc/mounts what device a mount point is using. @@ -33,109 +33,26 @@ /** * If the disk is on a networked device (NFS, ISCSI), * the main NIC needs STARTMODE nfsroot instead of auto. - * @return root dev over network: 1 iSCSI, 2 NFS + * @return root dev over network: `no `iscsi `nfs `fcoe */ -global integer isDiskOnNetwork(string device) { +global symbol isDiskOnNetwork(string device) { y2milestone("begin isDiskOnNetwork(%1) function", device); if (device=="nfs") { - return 2; + return `nfs; } if (size(device)==0) { y2error("Empty parameter for isDiskOnNetwork() function"); - return -1; + return `no; } - integer network_based=0; - // test for multipath - if (network_based==0 && issubstring(device, "/dev/dm-")) { - y2warning("multipath detected!"); - string dev_name = splitstring(device, "/")[2]:""; - y2milestone("Multipath device name %1", dev_name); - map<string, any> cmd = (map<string, any>)SCR::Execute(.target.bash_output, sformat("ls /sys/block/%1/slaves/", dev_name)); - y2milestone("Show slaves command:%1", cmd); - if (cmd["exit"]:-1==0){ - // FIXME: what about more slaves? - list<string> slaves = splitstring(cmd["stdout"]:"", "\n"); - integer nb = isDiskOnNetwork(sformat("/dev/%1", slaves[0]:"")); - if (nb > 0) { - network_based = nb; - } - } - else { - y2error("Error while executed show slaves commad:%1", cmd["stderr"]:""); - } - } - - // test for LVM - if (network_based==0 && issubstring(device, "/dev/mapper/")) { - y2warning("LVM detected!"); - string group_name = splitstring(splitstring(device, "/")[3]:"", "-")[0]:""; - y2milestone("LVM group name %1", group_name); - map<string, any> command = (map<string, any>)SCR::Execute(.target.bash_output, sformat("pvs 2>/dev/null|grep %1", group_name)); - foreach(string row, filter(string s, splitstring(command["stdout"]:"", "\n"), { return (size(s) > 0);}), { - string lvm_device = filter(string s, splitstring(row, " "), { return (size(s)>0);})[0]:""; - y2milestone("LVM physical device: %1", lvm_device); - integer nb = isDiskOnNetwork(lvm_device); - if (nb > 0) { - network_based = nb; - } - }); - } - - // test for RAID - if (network_based==0 && issubstring(device, "/dev/md")){ - y2warning("RAID detected!"); - string raid = splitstring(device, "/")[2]:""; - y2milestone("RAID %1 detected", raid); - map<string, any> command = (map<string, any>)SCR::Execute(.target.bash_output, sformat("cat /proc/mdstat |grep %1|tr -d '\\n'", raid)); - list<string> raid_devices = sublist(splitstring(command["stdout"]:"", " "), 4); - foreach(string dev, raid_devices, { - if (!issubstring(dev, "/dev/")) { - dev = sformat("/dev/%1", dev); - } - string raid_device = substring(dev, 0, findfirstof(dev, "[")); - integer nb = isDiskOnNetwork(raid_device); - if (nb > 0) { - network_based = nb; - } - }); - } - - //test for iSCSI - if (network_based==0){ - if (issubstring(device, "/dev/")){ - device = splitstring(device, "/")[2]:""; - } - string sys=sformat("/sys/class/block/%1", device); - if (FileUtils::Exists(sys)){ - if ((integer)SCR::Execute(.target.bash, sformat("ls -la %1 | grep -q session", sys))==0){ - y2warning("iSCSI detected!"); - network_based = 1; - } - } - } - - //test for FCoE - if (network_based==0){ - if (issubstring(device, "/dev/")){ - device = splitstring(device, "/")[2]:""; - } - - string sys=sformat("/sys/class/block/%1/device", device); - if (FileUtils::Exists(sys) && FileUtils::IsDirectory(sys)){ - if ((integer)SCR::Execute(.target.bash, sformat("cd %1; pwd -P | grep -q target", sys))==0){ - y2warning("FCoE detected!"); - network_based = 3; - } - } - } + symbol network_based = Storage::IsDeviceOnNetwork(device); // test for nfs (bnc#384420) - if (network_based==0) { + if (network_based == `no) { string space="[[:space:]]"; if (SCR::Execute(.target.bash, sformat("grep '%1%2%3*nfs%4' /proc/mounts ", space, device, space, space))==0){ y2milestone("device %1 is network based : %2", device, network_based); - network_based = 2; + network_based = `nfs; } } return network_based; Modified: branches/SuSE-Code-11-SP2-Branch/network/testsuite/tests/NetworkStorage.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/testsuite/tests/NetworkStorage.out (original) +++ branches/SuSE-Code-11-SP2-Branch/network/testsuite/tests/NetworkStorage.out Wed Oct 26 15:11:08 2011 @@ -1,12 +1,4 @@ -Read .target.tmpdir "/tmp" Execute .target.bash_output "grep ' / ' /proc/mounts|grep -v rootfs|tr -d '\n'" $["exit":0, "stderr":"", "stdout":"/dev/sda2 / ext3 rw,relatime,errors=continue,user_xattr,acl,commit=15,barrier=1,data=ordered 0 0"] -Return PASS +Return true Execute .target.bash_output "grep ' /home ' /proc/mounts|grep -v rootfs|tr -d '\n'" $["exit":0, "stderr":"", "stdout":"nfs.example.com:/home/ /home nfs4 rw,relatime,vers=4,rsize=1048576,wsize=1048576,namlen=255,hard,proto=tcp,port=0,timeo=600,retrans=2,sec=krb5i,clientaddr=10.0.2.2,minorversion=0,local_lock=none,addr=10.0.0.1 0 0"] -Return PASS -Read .target.stat "/sys/class/block/fc0" $["isdir":true] -Execute .target.bash "ls -la /sys/class/block/fc0 | grep -q session" 1 -Read .target.stat "/sys/class/block/fc0/device" $["isdir":true] -Read .target.stat "/sys/class/block/fc0/device" $["isdir":true] -Execute .target.bash "cd /sys/class/block/fc0/device; pwd -P | grep -q target" 0 -Log FCoE detected! -Return PASS +Return true Modified: branches/SuSE-Code-11-SP2-Branch/network/testsuite/tests/NetworkStorage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/testsuite/tests/NetworkStorage.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/network/testsuite/tests/NetworkStorage.ycp Wed Oct 26 15:11:08 2011 @@ -1,28 +1,10 @@ // { - +// testedfiles: NetworkStorage.ycp include "testsuite.ycp"; -// FIXME: factor out as Assert::Equal(...); -string AssertEqual(any expected, any actual, string fail_message) { - if (expected == actual) { - return "PASS"; - } - else { - if (fail_message == nil || fail_message == "") { - fail_message = sformat ("assertion failure, expected '%1', got '%2'", expected, actual); - } - y2error ("%1", fail_message); - return "FAIL"; - } -} +import "Assert"; -/* TODO -void Mock(map & dummy, path where, any what) { -... -} -Mock (EXECUTE, .target.bash_output, $["stdout": "O HAI!", ...]); -*/ map MockBash(string stdout) { return $[ "target" : $[ @@ -35,110 +17,38 @@ ]; } -map MockExit(integer exit) { - return $[ - "target" : $[ - "bash" : exit - ], - ]; -} - -map MockDir = - $[ - "target" : $[ - "stat" : $[ - "isdir": true, - ] - ], - ]; - -map MockFileMissing = - $[ - "target" : $[ - "stat" : $[] - ], - ]; - -map Add(map a, map b) { - map c = a; - foreach(any k, any v, b, { - if (is(v, map) && haskey(c, k) && is(c[k]:nil, map)) { - v = Add ((map) v, c[k]:$[]); - } - c[k] = v; - }); - return c; -} - -map Adder(list<map> many) { - map result = $[]; - foreach(map one, many, { - result = Add (result, one); - }); - return result; -} - map READ = $[ "target" : $[ "tmpdir" : "/tmp", ] ]; -TESTSUITE_INIT([READ], nil); +map WRITE = $[]; +map EXECUTE = MockBash(""); -import "NetworkStorage"; +TESTSUITE_INIT([READ, WRITE, EXECUTE], nil); -map WRITE = $[]; -map EXECUTE = $[]; +import "NetworkStorage"; EXECUTE = MockBash ("/dev/sda2 / ext3 rw,relatime,errors=continue,user_xattr,acl,commit=15,barrier=1,data=ordered 0 0"); TEST(``( - AssertEqual("/dev/sda2", NetworkStorage::getDevice("/"), "") + Assert::Equal("/dev/sda2", NetworkStorage::getDevice("/")) ), [READ, WRITE, EXECUTE], nil); EXECUTE = MockBash ("nfs.example.com:/home/ /home nfs4 rw,relatime,vers=4,rsize=1048576,wsize=1048576,namlen=255,hard,proto=tcp,port=0,timeo=600,retrans=2,sec=krb5i,clientaddr=10.0.2.2,minorversion=0,local_lock=none,addr=10.0.0.1 0 0"); TEST(``( - AssertEqual("nfs", NetworkStorage::getDevice("/home"), "") + Assert::Equal("nfs", NetworkStorage::getDevice("/home")) ), [READ, WRITE, EXECUTE], nil); - READ = MockFileMissing; - /* FIXME polish it to really test it -// pvs | grep foo -// FIXME I have no idea how the actual output looks like -EXECUTE = Adder([ - MockBash ("sda1 etc\nsda2 etc\n"), - MockExit (1), - ]); TEST(``( - AssertEqual(7, NetworkStorage::isDiskOnNetwork("/dev/mapper/foo-bar"), "") + Assert::Equal(`nfs, NetworkStorage::isDiskOnNetwork("server:/export")) ), [READ, WRITE, EXECUTE], nil); -EXECUTE = Adder([ - MockBash ("A B C D E[i] F[j]"), - MockExit (1), - ]); TEST(``( - AssertEqual(7, NetworkStorage::isDiskOnNetwork("/dev/md9"), "") - ), [READ, WRITE, EXECUTE], nil); - -TEST(``( - AssertEqual(7, NetworkStorage::isDiskOnNetwork("server:/export"), "") - ), [READ, WRITE, EXECUTE], nil); - -TEST(``( - AssertEqual(7, NetworkStorage::isDiskOnNetwork("server-v4:/"), "") + Assert::Equal(`nfs, NetworkStorage::isDiskOnNetwork("server-v4:/")) ), [READ, WRITE, EXECUTE], nil); */ -READ = MockDir; -list EXECUTE2 = [ - MockExit (1), //grep session - MockExit (0) //grep target -]; -TEST(``( - AssertEqual(3, NetworkStorage::isDiskOnNetwork("/dev/fc0"), "") - ), [READ, WRITE, EXECUTE2], nil); - } Modified: branches/SuSE-Code-11-SP2-Branch/network/testsuite/tests/Network_YaPI.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/testsuite/tests/Network_YaPI.out (original) +++ branches/SuSE-Code-11-SP2-Branch/network/testsuite/tests/Network_YaPI.out Wed Oct 26 15:11:08 2011 @@ -18,6 +18,9 @@ Dir .network.value."eth1": ["BOOTPROTO", "IPADDR"] Read .network.value."eth1".BOOTPROTO "static" Read .network.value."eth1".IPADDR "1.2.3.4/24" +Read .probe.architecture "i386" +Read .sysconfig.console.CONSOLE_ENCODING "UTF-8" +Execute .target.bash_output "locale -k charmap" $["exit":0, "stdout":"laptop.suse.cz"] Read .target.size "/etc/install.inf" 27 Dir .etc.install_inf: [] Read .target.string "/proc/cmdline" "laptop.suse.cz" Modified: branches/SuSE-Code-11-SP2-Branch/network/testsuite/tests/Network_YaPI.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/testsuite/tests/Network_YaPI.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/network/testsuite/tests/Network_YaPI.ycp Wed Oct 26 15:11:08 2011 @@ -13,7 +13,13 @@ "string" : "laptop.suse.cz", "bash_output" : "laptop.suse.cz" ], + "probe": $[ + "architecture": "i386" + ], "sysconfig": $[ + "console": $[ + "CONSOLE_ENCODING": "UTF-8" + ], "network" : $[ "config" : $[ "NETCONFIG_DNS_STATIC_SERVERS" : "208.67.222.222 208.67.220.220", Modified: branches/SuSE-Code-11-SP2-Branch/network/yast2-network.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/yast2-network.spec.in (original) +++ branches/SuSE-Code-11-SP2-Branch/network/yast2-network.spec.in Wed Oct 26 15:11:08 2011 @@ -17,6 +17,9 @@ #GetLanguageCountry #(in newly created yast2-country-data) Requires: yast2-country-data >= 2.16.3 +# Storage::IsDeviceOnNetwork +BuildRequires: yast2-storage >= 2.17.118 +Requires: yast2-storage >= 2.17.118 PreReq: /bin/rm -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0