Fix some import issues with the code.

diff --git a/pakfire/repository/__init__.py b/pakfire/repository/__init__.py
index 7c742946c01f5757bb8d3854514607b772bc35ef..b866693415f5373f2820ab882a5281e4a996dbca 100644 (file)
--- 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 ca7b8afcdd16f9527ceb9512088324be17f18f7b..9a60a8cd9371f25cc30a40cd78fc10f56b45fefb 100644 (file)
--- 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 81fee0490f3fb628375efb8f884be4bba069137b..2d1dbdf8c164cc2a7899bc504592e48df29fcfad 100644 (file)
--- 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 *