revert last

pisi/api.py

@@ -224,11 +224,12 @@ def list_upgradable():
 
     return upgradable
 
-def list_repos():
+def list_repos(onlyActive=True):
     """
     Return a list of the repositories -> list_of_strings
+    @param onlyActive: return only the active repos list -> list_of_strings
     """
-    return pisi.db.repodb.RepoDB().list_repos()
+    return pisi.db.repodb.RepoDB().list_repos(onlyActive)
 
 def get_install_order(packages):
     """

pisi/cli/listrepo.py

@@ -38,5 +38,5 @@ Lists currently tracked repositories.
         self.init(database = True, write = False)
         for repo in self.repodb.list_repos():
             ctx.ui.info(repo)
-            print '  ', self.repodb.get_repo_url(repo)
-
+            #FIXME: repodb.get_repo(repo).indexuri.get_uri()??? ick!
+            print '  ', self.repodb.get_repo(repo).indexuri.get_uri()

pisi/db/componentdb.py

@@ -34,8 +34,8 @@ class ComponentDB(lazydb.LazyDB):
         component_sources = {}
 
         self.repodb = pisi.db.repodb.RepoDB()
-        repos = filter(lambda x:self.repodb.repo_active(x), self.repodb.list_repos())
-        for repo in repos:
+
+        for repo in self.repodb.list_repos():
             doc = self.repodb.get_repo_doc(repo)
             component_nodes[repo] = self.__generate_components(doc)
             component_packages[repo] = self.__generate_packages(doc)

pisi/db/packagedb.py

@@ -45,8 +45,8 @@ class PackageDB(lazydb.LazyDB):
         self.__replaces = {}      # Replaces
 
         repodb = pisi.db.repodb.RepoDB()
-        repos = filter(lambda x:repodb.repo_active(x), repodb.list_repos())
-        for repo in repos:
+
+        for repo in repodb.list_repos():
             doc = repodb.get_repo_doc(repo)
             self.__package_nodes[repo] = self.__generate_packages(doc)
             self.__revdeps[repo] = self.__generate_revdeps(doc)

pisi/db/repodb.py

@@ -188,8 +188,8 @@ class RepoDB(lazydb.LazyDB):
                 repos.append(r)
         return repos
 
-    def list_repos(self):
-        return self.repoorder.get_order()
+    def list_repos(self, onlyActive=True):
+        return filter(lambda x:True if not onlyActive else self.repo_active(x), self.repoorder.get_order())
 
     def list_repo_urls(self):
         repos = []

pisi/db/sourcedb.py

@@ -33,8 +33,8 @@ class SourceDB(lazydb.LazyDB):
         self.__revdeps = {}
 
         repodb = pisi.db.repodb.RepoDB()
-        repos = filter(lambda x:repodb.repo_active(x), repodb.list_repos())
-        for repo in repos:
+
+        for repo in repodb.list_repos():
             doc = repodb.get_repo_doc(repo)
             self.__source_nodes[repo], self.__pkgstosrc[repo] = self.__generate_sources(doc)
             self.__revdeps[repo] = self.__generate_revdeps(doc)
@@ -52,7 +52,7 @@ class SourceDB(lazydb.LazyDB):
             sources[src_name] = gzip.zlib.compress(spec.toString())
             for package in spec.tags("Package"):
                 pkgstosrc[package.getTagData("Name")] = src_name
-
+        
         return sources, pkgstosrc
 
     def __generate_revdeps(self, doc):