gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r18658 - gnunet-update/gnunet_update


From: gnunet
Subject: [GNUnet-SVN] r18658 - gnunet-update/gnunet_update
Date: Sat, 17 Dec 2011 15:09:04 +0100

Author: harsha
Date: 2011-12-17 15:09:04 +0100 (Sat, 17 Dec 2011)
New Revision: 18658

Modified:
   gnunet-update/gnunet_update/update.py
Log:
syntax

Modified: gnunet-update/gnunet_update/update.py
===================================================================
--- gnunet-update/gnunet_update/update.py       2011-12-17 12:14:19 UTC (rev 
18657)
+++ gnunet-update/gnunet_update/update.py       2011-12-17 14:09:04 UTC (rev 
18658)
@@ -22,15 +22,16 @@
 # Updates an existing installation of gnunet to a new release
 
 import os
-import gpgme
 import getopt
 import sys
-import re
 import shutil
 import subprocess
+import tarfile
 
 import util
+import install_manifest
 import metadata
+from config import GnunetUpdateConfig
 
 def usage():
     """Print helpful usage information."""
@@ -80,7 +81,7 @@
             new_obj_cnt += 1
             continue
         if (old_install_objects[old_obj_cnt].name
-            = new_install_objects[new_obj_cnt].name):
+            == new_install_objects[new_obj_cnt].name):
             # If the hash is not the same, we delete older object
             if (old_install_objects[old_obj_cnt].hash 
                 != new_install_objects[new_obj_cnt].hash):
@@ -139,13 +140,17 @@
                                                  new_install_objects)
 
     # Delete objects in the to_be_deleted list
+    deleted_objects = list()
     for f_object in to_be_deleted_objects:
-        if os.path.isdir(f_object): # delete files first
+        if os.path.isdir(f_object.path): # delete files first
             continue
-        os.remove(f_object)
-        to_be_deleted_objects.remove(f_object)
-    for f_object in to_be_deleted_objects: #Only directories should be 
remaining
-        os.rmdir(f_object)      # delete them
+        os.remove(f_object.path)
+        # to_be_deleted_objects.remove(f_object)
+        deleted_objects.append(f_object)
+    for f_object in [obj for obj in to_be_deleted_objects 
+                     if obj not in deleted_objects]: 
+        #Only directories should be remaining
+        os.rmdir(f_object.path)      # delete them
 
     # Useful files retained from older installation
     retained_objects = [ f_object for f_object in old_install_objects
@@ -166,9 +171,9 @@
                                         needed_deps)
     retained_deps = [dep for dep in old_install_deps
                      if dep not in expired_deps]
-    needed_deps2 = filter_needed_deps(needed_deps,
+    needed_deps2 = util.filter_needed_deps(needed_deps,
                                       retained_deps)
-    to_be_installed_deps = filter_needed_deps(needed_deps2,
+    to_be_installed_deps = util.filter_needed_deps(needed_deps2,
                                               util.get_available_libs())
                                        
     dep_dir = os.path.join(install_dir, "lib/gnunet-deps")
@@ -180,8 +185,8 @@
         os.remove(dep.realname)
         os.remove(dep.name)
 
-    install_dep_files = list()
-    map(lambda dep: instal_dep_files.append(dep), retained_deps)
+    installed_dep_files = list()
+    map(lambda dep: installed_dep_files.append(dep), retained_deps)
 
     # Install the needed dependencies from tarfile
     for dep in to_be_installed_deps:




reply via email to

[Prev in Thread] Current Thread [Next in Thread]