X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=setup.py;h=33f04340cda7f6748191404f1d0ae51ec671562b;hb=7037b29ee56290d6cb9ff2539d54c8451a06f59d;hp=8ce7dbaebc659e6e91e00244048d671ef03d494d;hpb=1cc8e9613cab8b5b22478de369f259e591c54e6d;p=sfa.git

diff --git a/setup.py b/setup.py
index 8ce7dbae..33f04340 100755
--- a/setup.py
+++ b/setup.py
@@ -9,25 +9,29 @@ from glob import glob
 import shutil
 from distutils.core import setup
 
-from sfa.util.version import version_tag
+# while cleaning up we might not have this..
+try:
+    from sfa.util.version import version_tag
+except:
+    version_tag='cleaningup'
 
 scripts = glob("clientbin/*.py") + \
-    [ 
+    [
     'config/sfa-config-tty',
     'config/sfa-config',
 #    'config/gen-sfa-cm-config.py',
-    'sfa/server/sfa-start.py', 
-#    'sfa/server/sfa_component_setup.py', 
+    'sfa/server/sfa-start.py',
+#    'sfa/server/sfa_component_setup.py',
     'sfatables/sfatables',
     'keyconvert/keyconvert.py',
     'flashpolicy/sfa_flashpolicy.py',
     ]
 
 packages = [
-    'sfa', 
+    'sfa',
     'sfa/trust',
     'sfa/storage',
-    'sfa/util', 
+    'sfa/util',
     'sfa/server',
     'sfa/methods',
     'sfa/generic',
@@ -36,7 +40,6 @@ packages = [
     'sfa/rspecs',
     'sfa/rspecs/elements',
     'sfa/rspecs/elements/versions',
-    'sfa/rspecs/elements/v3',
     'sfa/rspecs/versions',
     'sfa/client',
     'sfa/planetlab',
@@ -44,7 +47,7 @@ packages = [
     'sfa/dummy',
     'sfa/openstack',
     'sfa/federica',
-    'sfa/senslab',
+    'sfa/iotlab',
     'sfatables',
     'sfatables/commands',
     'sfatables/processors',
@@ -92,24 +95,24 @@ if sys.argv[1] in ['uninstall', 'remove', 'delete', 'clean']:
     remove_bins = [ '/usr/bin/' + os.path.basename(bin) for bin in scripts ]
     remove_files = remove_bins + [ "/etc/init.d/%s"%x for x in initscripts ]
 
-    # remove files   
+    # remove files
     for filepath in remove_files:
         print "removing", filepath, "...",
-        try: 
+        try:
             os.remove(filepath)
             print "success"
         except: print "failed"
-    # remove directories 
-    for directory in remove_dirs: 
+    # remove directories
+    for directory in remove_dirs:
         print "removing", directory, "...",
-        try: 
+        try:
             shutil.rmtree(directory)
             print "success"
         except: print "failed"
 else:
     # avoid repeating what's in the specfile already
     setup(name='sfa',
-          packages = packages, 
+          packages = packages,
           data_files = data_files,
           scripts = scripts,
           url="http://svn.planet-lab.org/wiki/SFATutorial",