From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 17 Jul 2011 10:49:23 +0000 (+0200)
Subject: Fix some import issues with the code.
X-Git-Tag: 0.9.3~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=89fac8cf6614dfe1b3b46813a1571d6193202a4c;p=pakfire.git

Fix some import issues with the code.
---

diff --git a/pakfire/repository/__init__.py b/pakfire/repository/__init__.py
index 7c742946c..b86669341 100644
--- a/pakfire/repository/__init__.py
+++ b/pakfire/repository/__init__.py
@@ -2,13 +2,10 @@
 
 import logging
 
-import solver
-import satsolver
-
 import pakfire.packages as packages
 
+from base import RepositoryDummy
 from local import RepositoryDir, RepositoryBuild, RepositoryLocal
-from oddments import RepositoryDummy
 from remote import RepositorySolv
 
 class Repositories(object):
diff --git a/pakfire/repository/base.py b/pakfire/repository/base.py
index ca7b8afcd..9a60a8cd9 100644
--- a/pakfire/repository/base.py
+++ b/pakfire/repository/base.py
@@ -6,7 +6,7 @@ import logging
 import re
 
 import cache
-import satsolver
+import pakfire.satsolver as satsolver
 
 class RepositoryFactory(object):
 	def __init__(self, pakfire, name, description):
diff --git a/pakfire/repository/index.py b/pakfire/repository/index.py
index 81fee0490..2d1dbdf8c 100644
--- a/pakfire/repository/index.py
+++ b/pakfire/repository/index.py
@@ -5,11 +5,11 @@ import os
 
 import database
 import metadata
-import satsolver
 
 import pakfire.compress as compress
 import pakfire.downloader as downloader
 import pakfire.packages as packages
+import pakfire.satsolver as satsolver
 import pakfire.util as util
 
 from pakfire.constants import *