From 01fd36ba0bb7602d41ce8bb84af4b604c414ae1f Mon Sep 17 00:00:00 2001
From: Faik Uygur <faik@pardus.org.tr>
Date: Tue, 9 Jun 2009 05:57:11 +0000
Subject: [PATCH] list_repos should always list repos, but db's should not take
 into account inactive repos

---
 pisi/api.py            | 5 ++---
 pisi/cli/listrepo.py   | 4 ++--
 pisi/db/componentdb.py | 4 ++--
 pisi/db/packagedb.py   | 4 ++--
 pisi/db/repodb.py      | 4 ++--
 pisi/db/sourcedb.py    | 6 +++---
 6 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/pisi/api.py b/pisi/api.py
index 5329dcdc..2af471d6 100644
--- a/pisi/api.py
+++ b/pisi/api.py
@@ -224,12 +224,11 @@ def list_upgradable():
 
     return upgradable
 
-def list_repos(onlyActive=True):
+def list_repos():
     """
     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(onlyActive)
+    return pisi.db.repodb.RepoDB().list_repos()
 
 def get_install_order(packages):
     """
diff --git a/pisi/cli/listrepo.py b/pisi/cli/listrepo.py
index c8c229ee..39823976 100644
--- a/pisi/cli/listrepo.py
+++ b/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)
-            #FIXME: repodb.get_repo(repo).indexuri.get_uri()??? ick!
-            print '  ', self.repodb.get_repo(repo).indexuri.get_uri()
+            print '  ', self.repodb.get_repo_url(repo)
+
diff --git a/pisi/db/componentdb.py b/pisi/db/componentdb.py
index 7200f30a..b98ae5a9 100644
--- a/pisi/db/componentdb.py
+++ b/pisi/db/componentdb.py
@@ -34,8 +34,8 @@ class ComponentDB(lazydb.LazyDB):
         component_sources = {}
 
         self.repodb = pisi.db.repodb.RepoDB()
-
-        for repo in self.repodb.list_repos():
+        repos = filter(lambda x:self.repodb.repo_active(x), self.repodb.list_repos())
+        for repo in repos:
             doc = self.repodb.get_repo_doc(repo)
             component_nodes[repo] = self.__generate_components(doc)
             component_packages[repo] = self.__generate_packages(doc)
diff --git a/pisi/db/packagedb.py b/pisi/db/packagedb.py
index 68e5a1cf..76c432d4 100644
--- a/pisi/db/packagedb.py
+++ b/pisi/db/packagedb.py
@@ -45,8 +45,8 @@ class PackageDB(lazydb.LazyDB):
         self.__replaces = {}      # Replaces
 
         repodb = pisi.db.repodb.RepoDB()
-
-        for repo in repodb.list_repos():
+        repos = filter(lambda x:repodb.repo_active(x), repodb.list_repos())
+        for repo in repos:
             doc = repodb.get_repo_doc(repo)
             self.__package_nodes[repo] = self.__generate_packages(doc)
             self.__revdeps[repo] = self.__generate_revdeps(doc)
diff --git a/pisi/db/repodb.py b/pisi/db/repodb.py
index 009ba3a0..e0d758f6 100644
--- a/pisi/db/repodb.py
+++ b/pisi/db/repodb.py
@@ -188,8 +188,8 @@ class RepoDB(lazydb.LazyDB):
                 repos.append(r)
         return repos
 
-    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_repos(self):
+        return self.repoorder.get_order()
 
     def list_repo_urls(self):
         repos = []
diff --git a/pisi/db/sourcedb.py b/pisi/db/sourcedb.py
index 627e8968..c0dc7d38 100644
--- a/pisi/db/sourcedb.py
+++ b/pisi/db/sourcedb.py
@@ -33,8 +33,8 @@ class SourceDB(lazydb.LazyDB):
         self.__revdeps = {}
 
         repodb = pisi.db.repodb.RepoDB()
-
-        for repo in repodb.list_repos():
+        repos = filter(lambda x:repodb.repo_active(x), repodb.list_repos())
+        for repo in 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):