[Rapier-commits] r148 - in trunk: debian src

[rapier-commits at garage.maemo.org]

Author: pamadio
Date: 2007-08-16 22:17:49 +0300 (Thu, 16 Aug 2007)
New Revision: 148

Modified:
   trunk/debian/changelog
   trunk/src/swordutils.py
Log:
installing modules after vanilla install should work now

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-08-16 18:26:41 UTC (rev 147)
+++ trunk/debian/changelog	2007-08-16 19:17:49 UTC (rev 148)
@@ -4,7 +4,9 @@
   * Remote module management cosmetic.
   * Cursor not visible anymore in textview.
   * Package is binary independent.
-  * Automatic bookmarking when closing application. Feature request [#1007].
+  * Automatic bookmarking when closing application (feature request #1007).
+  * Fixe a bug where modules were not installed if there was no
+    modules/texts/ztext directory in Sword's DataPath.
 	
  -- Pierre Amadio <pierre.amadio at libertysurf.fr>  Sun, 16 Aug 2007 16:45:06 +0200
 

Modified: trunk/src/swordutils.py
===================================================================
--- trunk/src/swordutils.py	2007-08-16 18:26:41 UTC (rev 147)
+++ trunk/src/swordutils.py	2007-08-16 19:17:49 UTC (rev 148)
@@ -207,6 +207,10 @@
         #print "dst_conf='%s'"%dst_conf
         #print "dst_module='%s'"%dst_module
 
+        if not os.path.isdir(self.mgr.prefixPath+"/modules/texts/ztext"):
+            os.makedirs(self.mgr.prefixPath+"/modules/texts/ztext")
+
+            
         if os.path.isdir(tmp_mod):
             pipe=os.popen("rm -rf %s"%tmp_mod,'r')
             pipe.close()
@@ -269,7 +273,7 @@
 
         try:
             gnomevfs.xfer_uri(tmp_mod_uri,dst_module_uri,
-                              gnomevfs.XFER_DEFAULT,\
+                              gnomevfs.XFER_DEFAULT+gnomevfs.XFER_NEW_UNIQUE_DIRECTORY,\
                               gnomevfs.XFER_ERROR_ACTION_ABORT,\
                               gnomevfs.XFER_OVERWRITE_ACTION_REPLACE_ALL\
                               )