Do it in tmp.

[bookmarks_db.git] / Robots / bkmk_rforking.py

diff --git a/Robots/bkmk_rforking.py b/Robots/bkmk_rforking.py
index 849078e584a33abbb17cba4f6f74411a350e1aea..594359f9f3e8da5e42e2f3d576a3d93d0e0e266a 100644 (file)
--- a/Robots/bkmk_rforking.py
+++ b/Robots/bkmk_rforking.py
@@ -1,7 +1,7 @@
 """
    Forking robot
 
-   Written by BroytMann. Copyright (C) 2000-2007 PhiloSoft Design.
+   Written by Broytman. Copyright (C) 2000-2010 PhiloSoft Design.
 """
 
 
@@ -24,7 +24,7 @@ subp_pipe = None
 def stop_subp(log):
    global check_subp, subp_pipe
    if check_subp:
-      log("   restarting hanging subprocess")
+      if log: log("   restarting hanging subprocess")
       del check_subp
    del subp_pipe
 
@@ -47,15 +47,14 @@ class robot_forking(Robot):
       try:
          save_parent = bookmark.parent
          bookmark.parent = None
-
-         bookmark.tempfname = self.tempfname
          subp_pipe.write_record(pickle.dumps(bookmark))
 
-         if check_subp.waitForPendingChar(900): # wait 15 minutes
+         if check_subp.waitForPendingChar(60): # wait a minute
             new_b = pickle.loads(subp_pipe.read_record())
             for attr in ("error", "no_error",
                   "moved", "size", "md5", "real_title",
-                  "last_tested", "last_modified", "test_time", "icon"):
+                  "last_tested", "last_modified", "test_time",
+                  "icon", "icon_href"):
                if hasattr(new_b, attr):
                   setattr(bookmark, attr, getattr(new_b, attr))
          else: