Merge lp:~death-7/wicd/wicd into lp:wicd/1.6

[Deathzor]

Minor bug fix ( affecting gentoo dhclient users )

[lp:~death-7/wicd/wicd]

912. By Deathzor on 2014-07-07

Changed return_obj to False when running dhclient ( to prevent dhclient
trying to read stdin as a config file )

[Pieter Leclerc (pieterleclerc-deactivatedaccount)]

I added some inline notes about what, in my opinion, needs fixing.

I'm a bit skeptical about the "hacky" nature of the changes, so it would be great if you could elaborate on that a bit, about why dhclient reads from STDIN on Gentoo... I am using it as well and I don't notice any problems, so why is Gentoo's dhclient different?

Please improve, thanks a lot in advance, and we'll merge it!

review: Needs Fixing

Unmerged revisions

912. By Deathzor on 2014-07-07

Changed return_obj to False when running dhclient ( to prevent dhclient
trying to read stdin as a config file )

=== modified file 'wicd/wnettools.py'
--- wicd/wnettools.py	2013-02-15 21:30:48 +0000
+++ wicd/wnettools.py	2014-07-07 16:40:40 +0000
@@ -669,8 +669,15 @@
         cmd = self._get_dhcp_command('connect', hostname)
         if self.verbose:
             print cmd
-        self.dhcp_object = misc.Run(cmd, include_stderr=True, return_obj=True)
-        pipe = self.dhcp_object.stdout
+        if self._get_dhcp_command() == misc.DHCLIENT:
+ 		    self.dhcp_object = misc.Run(cmd, include_stderr=True, return_obj=False)
+			#Rather Dirty but means Pipe looks the same 
+			pipe = StringIO.StringIO();
+			pipe.write(self.dhcp_object)
+			pipe.seek(0);
+		else:
+		    self.dhcp_object = misc.Run(cmd, include_stderr=True, return_obj=True)
+            pipe = self.dhcp_object.stdout
         client_dict = { misc.DHCLIENT : self._parse_dhclient,
                         misc.DHCPCD : self._parse_dhcpcd,
                         misc.PUMP : self._parse_pump,
@@ -683,7 +690,9 @@
         else:
             print "ERROR: no dhcp client found"
             ret = None
-        self.dhcp_object.wait()
+		#we don't wait if we set return_obj to false
+        if self._get_dhcp_command() != misc.DHCLIENT:
+		   self.dhcp_object.wait()
         return ret
         
     @neediface(False)