X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=setup.py;h=a532cd3c6e989ab6b49e46d1f1a2b4b5c52f45fb;hb=9797fe9b994b5bddd2d1ee6ade36c6716fb9c118;hp=6b554e4e64ee5d808e97bd0f3dc797ae9c879fd8;hpb=9fcd24492ce3094030aa0f2fc73c86b2259cce4e;p=sfa.git

diff --git a/setup.py b/setup.py
index 6b554e4e..a532cd3c 100755
--- a/setup.py
+++ b/setup.py
@@ -13,6 +13,7 @@ bins = [ 'config/sfa-config-tty',
             'sfa/plc/sfa-import-plc.py', 
             'sfa/plc/sfa-nuke-plc.py', 
             'sfa/server/sfa-server.py', 
+            'sfa/server/sfa-clean-peer-records.py', 
             'sfa/client/sfi.py', 
             'sfa/client/getNodes.py',
             'sfa/client/getRecord.py',
@@ -20,7 +21,6 @@ bins = [ 'config/sfa-config-tty',
             'sfa/client/genidump.py',
             'sfatables/sfatables',
             ]
-remove_bins = [ '/usr/bin/' + os.path.basename(bin) for bin in bins ]
 
 package_dirs = [ 'sfa', 
                  'sfa/client',
@@ -29,6 +29,7 @@ package_dirs = [ 'sfa',
                  'sfa/server',
                  'sfa/trust',
                  'sfa/util', 
+                 'sfa/managers',
                  'sfa/rspecs',
                  'sfa/rspecs/aggregates',
                  'sfa/rspecs/aggregates/vini',
@@ -37,12 +38,13 @@ package_dirs = [ 'sfa',
                  'sfatables/processors',
                  ]
 
+
 data_files = [('/etc/sfa/', [ 'config/aggregates.xml',
                               'config/registries.xml',
                               'config/sfa_config',
                               'config/sfi_config']),
-              ('/etc/sfatables/matches/', glob('sfatables/matches/*')),
-              ('/etc/sfatables/targets/', glob('sfatables/targets/*')),
+              ('/etc/sfatables/matches/', glob('sfatables/matches/*.xml')),
+              ('/etc/sfatables/targets/', glob('sfatables/targets/*.xml')),
               ('/etc/init.d/', ['sfa/init.d/sfa'])]
 
 # add sfatables processors as data_files
@@ -58,8 +60,10 @@ initscripts = [ '/etc/init.d/sfa' ]
 
 if sys.argv[1] in ['uninstall', 'remove', 'delete', 'clean']:
     python_path = sys.path
-    site_packages_path = [ path + os.sep + 'sfa' for path in python_path if path.endswith('site-packages')]
-    remove_dirs = ['/etc/sfa/'] + site_packages_path
+    site_packages_path = [ os.path.join(p,'sfa') for p in python_path if p.endswith('site-packages')]
+    site_packages_path += [ os.path.join(p,'sfatables') for p in python_path if p.endswith('site-packages')]
+    remove_dirs = ['/etc/sfa/', '/etc/sfatables'] + site_packages_path
+    remove_bins = [ '/usr/bin/' + os.path.basename(bin) for bin in bins ]
     remove_files = remove_bins + initscripts
 
     # remove files