[yast-commit] r40095 - in /trunk/network: ./ package/ src/installation/ src/lan/ src/modules/ testsuite/tests/

8 Aug 2007

Author: mzugec
Date: Wed Aug  8 15:56:07 2007
New Revision: 40095

URL: http://svn.opensuse.org/viewcvs/yast?rev=40095&view=rev
Log:
- fixed wlan::firmware map
- when no interfaces configured and no NM skip
  InternetTest(#192818)
- fixed device selection for InternetTest (#296393)


Modified:
    trunk/network/VERSION
    trunk/network/package/yast2-network.changes
    trunk/network/src/installation/dialogs.ycp
    trunk/network/src/installation/inst_do_net_test.ycp
    trunk/network/src/lan/complex.ycp
    trunk/network/src/modules/Internet.ycp
    trunk/network/src/modules/Lan.ycp
    trunk/network/testsuite/tests/Internet.out
    trunk/network/testsuite/tests/Internet.ycp

Modified: trunk/network/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=40095&r1=40094&r2=40095&view=diff
==============================================================================

--- trunk/network/VERSION (original)
+++ trunk/network/VERSION Wed Aug  8 15:56:07 2007
@@ -1 +1 @@
-2.15.57
+2.15.58

Modified: trunk/network/package/yast2-network.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=40095&r1=40094&r2=40095&view=diff
==============================================================================
--- trunk/network/package/yast2-network.changes (original)
+++ trunk/network/package/yast2-network.changes Wed Aug  8 15:56:07 2007
@@ -1,4 +1,13 @@
 -------------------------------------------------------------------
+Wed Aug  8 15:28:18 CEST 2007 - mzugec@suse.cz
+
+- fixed wlan::firmware map
+- when no interfaces configured and no NM skip
+  InternetTest(#192818)
+- fixed device selection for InternetTest (#296393)
+- 2.15.58 
+
+-------------------------------------------------------------------
 Mon Aug  6 17:57:37 CEST 2007 - mzugec@suse.cz
 
 - copy udev rules from inst-sys (#297616)

Modified: trunk/network/src/installation/dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/installation/dialogs.ycp?rev=40095&r1=40094&r2=40095&view=diff
==============================================================================
--- trunk/network/src/installation/dialogs.ycp (original)
+++ trunk/network/src/installation/dialogs.ycp Wed Aug  8 15:56:07 2007
@@ -162,7 +162,7 @@
 
     Wizard::SetContents(caption, contents, help, true, true);
     Wizard::SetTitleIcon ("yast-network");
-initDevice(items);
+    initDevice(items);
 
 
     symbol ret = nil;
@@ -199,6 +199,7 @@
     }while(!exit);
 
     Internet::do_test = UI::QueryWidget(`id(`rb), `CurrentButton) == `yes;
+    Internet::SetDevice(current);
     y2debug("Internet::do_test=%1", Internet::do_test);
 
     return (symbol) ret;

Modified: trunk/network/src/installation/inst_do_net_test.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/installation/inst_do_net_test.ycp?rev=40095&r1=40094&r2=40095&view=diff
==============================================================================
--- trunk/network/src/installation/inst_do_net_test.ycp (original)
+++ trunk/network/src/installation/inst_do_net_test.ycp Wed Aug  8 15:56:07 2007
@@ -284,7 +284,7 @@
 
     define integer wait_for_test ()
     {
-	while ( (boolean)SCR::Read(.background.output_open) )
+	while ( (boolean)SCR::Read(.background.output_open) || (boolean)SCR::Read(.background.isrunning) )
 	{
 	    sleep (100);
 
@@ -319,12 +319,6 @@
      * @return true when successful
      */
     define boolean download_release_notes () {
-	// Fallback for situation that mustn't exist
-	if (Product::relnotesurl_all == nil || Product::relnotesurl_all == []) {
-	    y2milestone("Product::relnotesurl_all = %1", Product::relnotesurl_all);
-	    return true;
-	}
-
 	// At least one release notes downloaded means success
 	// but the default is false in case of some release-notes
 	// available for download
@@ -383,8 +377,9 @@
 	    // env["LANG"] = GetLanguageUTF8 ();
 
 	    y2milestone ("Downloading release notes: %1", cmd);
-	    SCR::Execute(.background.run, cmd);
-	    integer ret = wait_for_test ();
+//	    SCR::Execute(.background.run, cmd);
+//	    integer ret = wait_for_test ();
+	    integer ret = (integer)SCR::Execute(.target.bash, cmd);
 	    if (ret == 0) {
 		release_notes_filenames = add (release_notes_filenames, filename);
 		y2milestone("Successful");
@@ -623,6 +618,16 @@
 
 	    boolean ret = true;
 
+//Product::relnotesurl_all=[ "http://www.suse.com/relnotes/i386/openSUSE/10.3/release-notes.rpm" ];
+//y2error("FAKE RELNOTES!");
+	    y2milestone("Product::relnotesurl_all = %1", Product::relnotesurl_all);
+	// Fallback for situation that mustn't exist
+	if (Product::relnotesurl_all == nil || Product::relnotesurl_all == []) {
+	 Popup::Warning(_("There is no URL for release notes defined. Internet test can't be performed."));
+	 ret = false;
+	} else
+	 {
+
 	    if (!download_release_notes ())
 	    {
 		// return code is not on the blacklist (meaning misconfigured network)
@@ -649,7 +654,7 @@
 		}
 		test_stage = `close;
 	    }
-
+	  }
 	    if (ret)
 	    {
 		install_release_notes ();

Modified: trunk/network/src/lan/complex.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/complex.ycp?rev=40095&r1=40094&r2=40095&view=diff
==============================================================================
--- trunk/network/src/lan/complex.ycp (original)
+++ trunk/network/src/lan/complex.ycp Wed Aug  8 15:56:07 2007
@@ -120,7 +120,8 @@
 	"ipw2100" : "ipw-firmware",
 	"ipw2200" : "ipw-firmware",
 	"ipw3945" : "ipw-firmware",
-	"iwlwifi" : "ipw-firmware",
+	"iwl3945" : "iwl3945-ucode",
+	"iwl4965" : "iwl4965-ucode",
 	"bcm43xx" : "",
 	"prism54" : "",
 	"spectrum_cs" : "",

Modified: trunk/network/src/modules/Internet.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Internet.ycp?rev=40095&r1=40094&r2=40095&view=diff
==============================================================================
--- trunk/network/src/modules/Internet.ycp (original)
+++ trunk/network/src/modules/Internet.ycp Wed Aug  8 15:56:07 2007
@@ -121,7 +121,7 @@
 
     NetworkDevices::Read();
     device = NetworkDevices::Fastest();
-    if (device == "")
+    if ((string)SCR::Read(.sysconfig.network.config.NETWORKMANAGER)=="yes" && device == "")
     {
 	device = GetDevices ()[0]:"";
     }

Modified: trunk/network/src/modules/Lan.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=40095&r1=40094&r2=40095&view=diff
==============================================================================
--- trunk/network/src/modules/Lan.ycp (original)
+++ trunk/network/src/modules/Lan.ycp Wed Aug  8 15:56:07 2007
@@ -701,16 +701,19 @@
 
 
     /* Something is already configured -> do nothing */
+    boolean configured=false;
     foreach (integer number, any lanitem, LanItems::Items, {
 //	if (hasAnyValue(((map)lanitem)["hwinfo", "dev_name"]:"")) {
 	LanItems::current = number;
 	if (LanItems::IsItemConfigured()){
 	 y2milestone("Something already configured: don't propose.");
 //	 y2milestone("devs=%1", devs);
-	 return false;
+	 configured = true;
+	 break;
         }
 //       }
       });
+    if (configured) return false;
 
 
     foreach (integer number, any lanitem, LanItems::Items, {
@@ -1079,7 +1082,7 @@
     {
 	if (!PackageSystem::Installed("ifplugd")) pkgs = add (pkgs, "ifplugd");
     }
-    // #49880
+    // #suse49880
     if (NetworkDevices::List ("wlan") != [])
     {
 	if (!PackageSystem::Installed("wireless-tools")) pkgs = add (pkgs, "wireless-tools");

Modified: trunk/network/testsuite/tests/Internet.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/testsuite/tests/Internet.out?rev=40095&r1=40094&r2=40095&view=diff
==============================================================================
--- trunk/network/testsuite/tests/Internet.out (original)
+++ trunk/network/testsuite/tests/Internet.out Wed Aug  8 15:56:07 2007
@@ -4,62 +4,73 @@
 Dir	.network.value."dsl0": ["DEVICE"]
 Read	.network.value."dsl0".DEVICE "eth0"
 Dir	.network.value."eth0": []
+Read	.sysconfig.network.config.NETWORKMANAGER "yes"
 Return	true
 Dump	dsl0
 Dump	dsl
 Dir	.network.section: ["dsl0", "eth0"]
 Dir	.network.value."dsl0": []
 Dir	.network.value."eth0": []
+Read	.sysconfig.network.config.NETWORKMANAGER "yes"
 Return	true
 Dump	dsl0
 Dump	dsl
 Dir	.network.section: ["eth1", "tr0"]
 Dir	.network.value."eth1": []
 Dir	.network.value."tr0": []
+Read	.sysconfig.network.config.NETWORKMANAGER "yes"
 Return	true
 Dump	eth1
 Dump	netcard
 Dir	.network.section: ["dsl0", "tr0"]
 Dir	.network.value."dsl0": []
 Dir	.network.value."tr0": []
+Read	.sysconfig.network.config.NETWORKMANAGER "yes"
 Return	true
 Dump	dsl0
 Dump	dsl
 Dir	.network.section: ["dsl0", "ppp0"]
 Dir	.network.value."dsl0": []
 Dir	.network.value."ppp0": []
+Read	.sysconfig.network.config.NETWORKMANAGER "yes"
 Return	true
 Dump	dsl0
 Dump	dsl
 Dir	.network.section: ["ppp0", "tr1"]
 Dir	.network.value."ppp0": []
 Dir	.network.value."tr1": []
+Read	.sysconfig.network.config.NETWORKMANAGER "yes"
 Return	true
 Dump	ppp0
 Dump	modem
 Dir	.network.section: ["ppp0"]
 Dir	.network.value."ppp0": []
+Read	.sysconfig.network.config.NETWORKMANAGER "yes"
 Return	true
 Dump	ppp0
 Dump	modem
 Dir	.network.section: ["ippp0", "tr1"]
 Dir	.network.value."ippp0": []
 Dir	.network.value."tr1": []
+Read	.sysconfig.network.config.NETWORKMANAGER "yes"
 Return	true
 Dump	ippp0
 Dump	isdn
 Dir	.network.section: ["ippp0", "ppp0"]
 Dir	.network.value."ippp0": []
 Dir	.network.value."ppp0": []
+Read	.sysconfig.network.config.NETWORKMANAGER "yes"
 Return	true
 Dump	ippp0
 Dump	isdn
 Dir	.network.section: []
+Read	.sysconfig.network.config.NETWORKMANAGER "yes"
 Execute	.target.bash_output "ip -oneline link list | sed -e 's/^[0-9]*: \\([^:]*\\).*/\\1/' | grep -v 'lo\\|sit0'" $["exit":0, "stderr":"", "stdout":""]
 Return	false
 Dump	
 Dump	
 Dir	.network.section: []
+Read	.sysconfig.network.config.NETWORKMANAGER "yes"
 Execute	.target.bash_output "ip -oneline link list | sed -e 's/^[0-9]*: \\([^:]*\\).*/\\1/' | grep -v 'lo\\|sit0'" $["exit":0, "stderr":"", "stdout":"eth0\nppp0\n"]
 Log	No such device: eth0
 Return	true

Modified: trunk/network/testsuite/tests/Internet.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/testsuite/tests/Internet.ycp?rev=40095&r1=40094&r2=40095&view=diff
==============================================================================
--- trunk/network/testsuite/tests/Internet.ycp (original)
+++ trunk/network/testsuite/tests/Internet.ycp Wed Aug  8 15:56:07 2007
@@ -6,7 +6,7 @@
     "probe" : $[ "system" : []],
     "target" : $[
 	"tmpdir" : "/tmp",
-    ],
+    ]
 ];
 
 map WRITE = $[];
@@ -31,69 +31,74 @@
     "network" : $[
 	"section" : $[ "dsl0":$[], "eth0":$[] ],
 	"value" : $[ "dsl0" :$["DEVICE":"eth0"], "eth0":$[] ],
-    ]
+    ],
+    "sysconfig": $[ "network": 
+		  $["config": 
+		   $["NETWORKMANAGER":"yes"]
+		   ]
+	          ]
 ];
 TEST(``(Internet::FindFastest()), [READ, WRITE, EXECUTE], nil);
 DUMP(Internet::device);
 DUMP(Internet::type);
 
 NetworkDevices::initialized = false;
-READ = $[ "network" : $[ "section" : $[ "dsl0":$[], "eth0":$[] ]]];
+READ["network"] = $[ "section" : $[ "dsl0":$[], "eth0":$[] ]];
 TEST(``(Internet::FindFastest()), [READ, WRITE, EXECUTE], nil);
 DUMP(Internet::device);
 DUMP(Internet::type);
 
 NetworkDevices::initialized = false;
-READ = $[ "network" : $[ "section" : $[ "eth1":$[], "tr0":$[] ]]];
+READ["network"]= $[ "section" : $[ "eth1":$[], "tr0":$[] ]];
 TEST(``(Internet::FindFastest()), [READ, WRITE, EXECUTE], nil);
 DUMP(Internet::device);
 DUMP(Internet::type);
 
 NetworkDevices::initialized = false;
-READ = $[ "network" : $[ "section" : $[ "dsl0":$[], "tr0":$[] ]]];
+READ["network"] = $[ "section" : $[ "dsl0":$[], "tr0":$[] ]];
 TEST(``(Internet::FindFastest()), [READ, WRITE, EXECUTE], nil);
 DUMP(Internet::device);
 DUMP(Internet::type);
 
 NetworkDevices::initialized = false;
-READ = $[ "network" : $[ "section" : $[ "dsl0":$[], "ppp0":$[] ]]];
+READ["network"] = $[ "section" : $[ "dsl0":$[], "ppp0":$[] ]];
 TEST(``(Internet::FindFastest()), [READ, WRITE, EXECUTE], nil);
 DUMP(Internet::device);
 DUMP(Internet::type);
 
 NetworkDevices::initialized = false;
-READ = $[ "network" : $[ "section" : $[ "ppp0":$[], "tr1":$[] ]]];
+READ["network"] = $[ "section" : $[ "ppp0":$[], "tr1":$[] ]];
 TEST(``(Internet::FindFastest()), [READ, WRITE, EXECUTE], nil);
 DUMP(Internet::device);
 DUMP(Internet::type);
 
 NetworkDevices::initialized = false;
-READ = $[ "network" : $[ "section" : $[ "ppp0":$[] ]]];
+READ["network"] = $[ "section" : $[ "ppp0":$[] ]];
 TEST(``(Internet::FindFastest()), [READ, WRITE, EXECUTE], nil);
 DUMP(Internet::device);
 DUMP(Internet::type);
 
 NetworkDevices::initialized = false;
-READ = $[ "network" : $[ "section" : $[ "ippp0":$[], "tr1":$[] ]]];
+READ["network"] = $[ "section" : $[ "ippp0":$[], "tr1":$[] ]];
 TEST(``(Internet::FindFastest()), [READ, WRITE, EXECUTE], nil);
 DUMP(Internet::device);
 DUMP(Internet::type);
 
 NetworkDevices::initialized = false;
-READ = $[ "network" : $[ "section" : $[ "ippp0":$[], "ppp0":$[] ]]];
+READ["network"] = $[ "section" : $[ "ippp0":$[], "ppp0":$[] ]];
 TEST(``(Internet::FindFastest()), [READ, WRITE, EXECUTE], nil);
 DUMP(Internet::device);
 DUMP(Internet::type);
 
 NetworkDevices::initialized = false;
-READ = $[ "network" : $[ "section" : $[]]];
+READ["network"] = $[ "section" : $[]];
 TEST(``(Internet::FindFastest()), [READ, WRITE, EXECUTE], nil);
 DUMP(Internet::device);
 DUMP(Internet::type);
 
 NetworkDevices::initialized = false;
 Internet::devices = nil;
-READ = $[ "network" : $[ "section" : $[]]];
+READ["network"] = $[ "section" : $[]];
 TEST(``(Internet::FindFastest()), [READ, WRITE, EXECUTE2], nil);
 DUMP(Internet::device);
 DUMP(Internet::type);

-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org

    

[yast-commit] r40095 - in /trunk/network: ./ package/ src/installation/ src/lan/ src/modules/ testsuite/tests/

mzugec＠svn.opensuse.org