Author: titmuss
Date: Mon May 12 08:03:10 2008
New Revision: 2437
URL: http://svn.slimdevices.com?rev=2437&root=Jive&view=rev
Log:
Bug: 7120
Description:
Fixes for unix.
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/jive/net/NetworkThread.lua
7.1/trunk/squeezeplay/src/squeezeplay/share/jive/net/Process.lua
Modified: 7.1/trunk/squeezeplay/src/squeezeplay/share/jive/net/NetworkThread.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/jive/net/NetworkThread.lua?rev=2437&root=Jive&r1=2436&r2=2437&view=diff
==============================================================================
--- 7.1/trunk/squeezeplay/src/squeezeplay/share/jive/net/NetworkThread.lua
(original)
+++ 7.1/trunk/squeezeplay/src/squeezeplay/share/jive/net/NetworkThread.lua Mon
May 12 08:03:10 2008
@@ -341,10 +341,10 @@
local arp = ""
local cmd = "arp " .. host
- if string.match(os.getenv("OS"), "Windows") then
+ if string.match(os.getenv("OS") or "", "Windows") then
cmd = "arp -a " .. host
end
-
+
local proc = Process(self, cmd)
proc:read(function(chunk, err)
if err then
Modified: 7.1/trunk/squeezeplay/src/squeezeplay/share/jive/net/Process.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/jive/net/Process.lua?rev=2437&root=Jive&r1=2436&r2=2437&view=diff
==============================================================================
--- 7.1/trunk/squeezeplay/src/squeezeplay/share/jive/net/Process.lua (original)
+++ 7.1/trunk/squeezeplay/src/squeezeplay/share/jive/net/Process.lua Mon May 12
08:03:10 2008
@@ -36,7 +36,7 @@
return
end
- if string.match(os.getenv("OS"), "Windows") then
+ if string.match(os.getenv("OS") or "", "Windows") then
-- blocking on Windows!
local chunk = self.fh:read("*a")
self.fh:close()
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
