Fixes for fsmount

fs/commands/fsmount.py

@@ -40,21 +40,31 @@ Mounts a file system on a system path"""
         windows = platform == "Windows"
                 
         if options.unmount:
-            try:                
-                mount_path = args[0][:1]
-            except IndexError:
-                self.error('Mount path required\n')
-                return 1
+
             if windows:
+                
+                try:                
+                    mount_path = args[0][:1]
+                except IndexError:
+                    self.error('Driver letter\n')
+                    return 1
+                
                 from fs.expose import dokan
                 mount_path = mount_path[:1].upper()
-                dokan.unmount(mount_path)
-                self.output('unmounting %s:' % mount_path, True)
+                self.output('unmounting %s:\n' % mount_path, True)
+                dokan.unmount(mount_path)                
                 return
-            else:
+            
+            else:                
+                try:                
+                    mount_path = args[0]
+                except IndexError:
+                    self.error('Mount path required\n')
+                    return 1                                
+                
                 from fs.expose import fuse
-                fuse.unmount(mount_path)
-                self.output('unmounting %s' % mount_path, True)
+                self.output('unmounting %s\n' % mount_path, True)
+                fuse.unmount(mount_path)                
                 return
         
         try:
@@ -82,9 +92,7 @@ Mounts a file system on a system path"""
             path = '/'
         if not options.nocache:
             fs.cache_hint(True)
-        if windows and not os.path.exists(mount_path):
-           os.makedirs(mount_path)
-           
+                
         if windows:
             from fs.expose import dokan
             
@@ -92,7 +100,7 @@ Mounts a file system on a system path"""
                 self.error('Driver letter should be one character')
                 return 1
             
-            self.output("Mounting %s on %s:" % (fs, mount_path), True)
+            self.output("Mounting %s on %s:\n" % (fs, mount_path), True)
             flags = dokan.DOKAN_OPTION_REMOVABLE
             if options.debug:
                 flags |= dokan.DOKAN_OPTION_DEBUG | dokan.DOKAN_OPTION_STDERR
@@ -105,8 +113,12 @@ Mounts a file system on a system path"""
                              volname=str(fs))
             
         else:
+            
+            if not os.path.exists(mount_path):
+                os.makedirs(mount_path)
+            
             from fs.expose import fuse
-            self.output("Mounting %s on %s" % (fs, mount_path), True)
+            self.output("Mounting %s on %s\n" % (fs, mount_path), True)
             
             if options.foreground:                                            
                 fuse_process = fuse.mount(fs,

fs/tempfs.py

@@ -56,14 +56,20 @@ class TempFS(OSFS):
     def __unicode__(self):
         return u'<TempFS: %s>' % self._temp_dir
     
-    def __setstate__(self, state):
-        """Pickle the TempFS. TempFS delted their contents when closed, so pickling
-        is not garanteed to preserve the directory contents"""
-        state = super(TempFS, self).__setstate__(state)        
-        self._temp_dir = tempfile.mkdtemp(self.identifier or "TempFS", dir=self.temp_dir)  
-        super(TempFS, self).__init__(self._temp_dir,
-                                     dir_mode=self.dir_mode,
-                                     thread_synchronize=self.thread_synchronize)      
+    def __getstate__(self):
+        # If we are picking a TempFS, we want to preserve its contents,
+        # so we *don't* do the clean
+        state = super(TempFS, self).__getstate__()
+        self._cleaned = True
+        return state
+    
+    def __setstate__(self, state):        
+        state = super(TempFS, self).__setstate__(state)  
+        self._cleaned = False      
+        #self._temp_dir = tempfile.mkdtemp(self.identifier or "TempFS", dir=self.temp_dir)  
+        #super(TempFS, self).__init__(self._temp_dir,
+        #                             dir_mode=self.dir_mode,
+        #                             thread_synchronize=self.thread_synchronize)      
 
     def close(self):
         """Removes the temporary directory.

fs/tests/test_expose.py

@@ -121,7 +121,7 @@ else:
     class TestFUSE(unittest.TestCase,FSTestCases,ThreadingTestCases):
 
         def setUp(self):
-            self.temp_fs = TempFS()
+            self.temp_fs = TempFS()            
             self.temp_fs.makedir("root")
             self.temp_fs.makedir("mount")
             self.mounted_fs = self.temp_fs.opendir("root")