- added blacklists for libtest

git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@1206 cd1c1023-2f26-0410-ae45-c471fc1f0318

libraries/entropy.py

@@ -461,7 +461,9 @@ class EquoInterface(TextInterface):
             ldpath = ldpath.encode(sys.getfilesystemencoding())
             for currentdir,subdirs,files in os.walk(etpConst['systemroot']+ldpath):
                 for item in files:
-                    filepath = currentdir+"/"+item
+                    filepath = os.path.join(currentdir,item)
+                    if filepath in etpConst['libtest_files_blacklist']:
+                        continue
                     if os.access(filepath,os.X_OK):
                         executables.add(filepath[len(etpConst['systemroot']):])
 
@@ -555,6 +557,9 @@ class EquoInterface(TextInterface):
                     packages = rdbconn.searchBelongs(file = "%"+lib, like = True, branch = etpConst['branch'])
                     if packages:
                         for idpackage in packages:
+                            key, slot = rdbconn.retrieveKeySlot(idpackage)
+                            if key in etpConst['libtest_blacklist']:
+                                continue
                             # retrieve content and really look if library is in ldpath
                             mycontent = rdbconn.retrieveContent(idpackage)
                             matching_libs = [x for x in mycontent if x.endswith(lib) and (os.path.dirname(x) in ldpaths)]

libraries/entropyConstants.py

@@ -582,6 +582,16 @@ def initConfig_entropyConstants(rootdir):
                                     '/var/lib/scrollkeeper', '/usr/src', '/etc/skel', '/etc/ssh', '/etc/ssl', '/var/run', '/var/spool/cron', '/var/lib/init.d',
                                     '/lib/modules', '/etc/env.d', '/etc/gconf', '/etc/runlevels', '/lib/splash/cache', '/usr/share/mime', '/etc/portage'
         ],
+        'libtest_blacklist': [
+            'www-client/mozilla-firefox-bin',
+            'dev-java/blackdown-jdk',
+        ],
+        'libtest_files_blacklist': [
+            '/usr/lib64/openmotif-2.2/libMrm.so.3',
+            '/usr/lib64/openmotif-2.2/libXm.so.3',
+            '/usr/lib/openmotif-2.2/libMrm.so.3',
+            '/usr/lib/openmotif-2.2/libXm.so.3'
+        ],
         'officialrepositoryid': "sabayonlinux.org", # our official repository name
         'conntestlink': "http://www.google.com", 
         'databasestarttag': "|ENTROPY:PROJECT:DB:MAGIC:START|", # tag to append to .tbz2 file before entropy database (must be 32bytes)

libraries/outputTools.py

@@ -332,9 +332,11 @@ class TextInterface:
         data['type'] = type
         data['count'] = count[:]
         data['percent'] = percent
-        task = self.entropyTools.parallelTask(self.__TextInterface_updateText, data)
-        task.parallel_wait()
-        task.start()
+        #task = self.entropyTools.parallelTask(self.__TextInterface_updateText, data)
+        #task.parallel_wait()
+        #task.start()
+        self.__TextInterface_updateText(data)
+
         del data