Author: bklaas
Date: Tue Jun 15 08:57:29 2010
New Revision: 8853

URL: http://svn.slimdevices.com/jive?rev=8853&view=rev
Log:
Fixed Bug: 16263
Description: prepend /media on to paths for finding .Squeezebox dir to delete 
in wipe/rescan

Modified:
    
7.5/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/SqueezeCenterApplet.lua

Modified: 
7.5/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/SqueezeCenterApplet.lua
URL: 
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/SqueezeCenterApplet.lua?rev=8853&r1=8852&r2=8853&view=diff
==============================================================================
--- 
7.5/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/SqueezeCenterApplet.lua
 (original)
+++ 
7.5/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeCenter/SqueezeCenterApplet.lua
 Tue Jun 15 08:57:29 2010
@@ -498,7 +498,9 @@
        end
 
        -- wipe the .Squeezebox directory forcefully through linux
-       local command = "rm -rf " .. scDrive .. "/.Squeezebox &"
+       local command = "rm -rf /media/" .. scDrive .. "/.Squeezebox &"
+
+       log:debug('remove .Squeezebox dir: ', command)
        os.execute(command)
 
        self.wipeTimeout = 0
@@ -700,7 +702,8 @@
 function squeezeboxDirPresent(self, scDrive)
        local present = false
        
-       for f in lfs.dir(scDrive) do
+       local scDriveLocation = "/media/" .. scDrive
+       for f in lfs.dir(scDriveLocation) do
                present = string.match(f, "^\.Squeezebox")
                if present then
                        log:info("squeezeboxDirPresent(), found it: ", present)

_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins

Reply via email to