Update blacklists

ChangeLog.txt

@@ -1,7 +1,10 @@
 2.5.4 - 20/06/2015
-Fixed
+Fixed:
 - Check repository if exist when package upgrade
 - AttributeError: 'list' object has no attribute 'splitlines' in "--tracking" Thanks to Brenton Earl for report
+- Check exist or enabled repostitories when upgraded in options
+Updated:
+- Toolbar time
 
 2.5.3 - 20/06/2015
 Added:

conf/blacklist

@@ -8,11 +8,12 @@
 # This one will blacklist all packages include string "lib" in package name:
 # *lib*
 #
-# Exclude packages with repository priority:
-# sbo:py*        `excluded all packages from sbo starts with 'py'`
-# sbo:jdk        `excluded jdk package from sbo repository`
-# slack:*multi*  `excluded packages include string 'multi' from slack`
-# msb:*.txz      `excluded packages ends with '.txz' from msb repository`
+# Add packages in blacklist by repository:
+# slacky:*       `add all packages from slacky repository`
+# sbo:py*        `add all packages from sbo starts with 'py'`
+# sbo:jdk        `add jdk package from sbo repository`
+# slack:*multi*  `add packages include string 'multi' from slack`
+# msb:*.txz      `add packages ends with '.txz' from msb repository`
 #
 # Sometimes the automatic kernel update creates problems because you
 # may need to file intervention 'lilo'. The slpkg automatically detects

slpkg/blacklist.py

@@ -25,7 +25,6 @@
 from utils import Utils
 from splitting import split_package
 from __metadata__ import MetaData as _meta_
-from slpkg.pkg.find import find_package
 
 
 class BlackList(object):
@@ -140,8 +139,3 @@ class BlackList(object):
             if bl not in black and "*" not in bl:
                 black.append(bl)
         return black
-
-    def installed(self):
-        """Return all installed packages
-        """
-        return find_package("", _meta_.pkg_path)

slpkg/pkg/find.py

@@ -23,7 +23,7 @@
 
 
 import os
-# from slpkg.blacklist import BlackList
+from slpkg.blacklist import BlackList
 from slpkg.splitting import split_package
 
 
@@ -33,7 +33,7 @@ def find_package(find_pkg, directory):
     """
     pkgs = []
     installed = sorted(os.listdir(directory))
-    blacklist = ""
+    blacklist = BlackList().packages(pkgs=installed, repo="local")
     if os.path.exists(directory):
         for pkg in installed:
             if (not pkg.startswith(".") and pkg.startswith(find_pkg) and