Move from libsatsolver to libsolv.

diff --git a/po/pakfire.pot b/po/pakfire.pot
index b4d8631df450c22583f04e74d1a809e29a1f706e..8e94911e040c0b57394e4b947cb6613f85eab128 100644 (file)
--- a/po/pakfire.pot
+++ b/po/pakfire.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-05 18:22+0200\n"
+"POT-Creation-Date: 2011-08-05 19:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/setup.py b/setup.py
index d5cced39cd2743e81e0794968d570c2c0dc44db4..05d417a1bc6c9443ed143fd48c509c0323ef5f91 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -35,7 +35,7 @@ setup(
        ],
        ext_modules = [
                Extension("pakfire._pakfire", _pakfire_module_files,
-                       extra_link_args = ["-lsatsolver", "-lsatsolverext"])
+                       extra_link_args = ["-lsolv", "-lsolvext"])
        ],
        cmdclass = { "build" : build_extra.build_extra,
                     "build_i18n" :  build_i18n.build_i18n },

diff --git a/src/pool.c b/src/pool.c
index bfd0977ec907999a25714e6107361a5d220f66e5..4a2fc682998d34c594b6979d5451d4c711f346fa 100644 (file)
--- a/src/pool.c
+++ b/src/pool.c
@@ -1,6 +1,6 @@
 
 #include <Python.h>
-#include <satsolver/poolarch.h>
+#include <solv/poolarch.h>
 
 #include "config.h"
 #include "pool.h"

diff --git a/src/pool.h b/src/pool.h
index 0da71936e2fff2cce4a989d185c56ba5950c4015..70a8a13c6d2285856fb7e56d2c7eb12f0dff4c63 100644 (file)
--- a/src/pool.h
+++ b/src/pool.h
@@ -4,7 +4,7 @@
 
 #include <Python.h>
 
-#include <satsolver/pool.h>
+#include <solv/pool.h>
 
 // Sat Pool object
 typedef struct {

diff --git a/src/problem.h b/src/problem.h
index 15b3722cace04283f3aefc9abc6433fb386bbe16..6cb97715c78735789ae6c8d65fcba0737ad286e1 100644 (file)
--- a/src/problem.h
+++ b/src/problem.h
@@ -4,8 +4,8 @@
 
 #include <Python.h>
 
-#include <satsolver/pool.h>
-#include <satsolver/solver.h>
+#include <solv/pool.h>
+#include <solv/solver.h>
 
 // Sat Problem object
 typedef struct {

diff --git a/src/relation.h b/src/relation.h
index 0ba8a4fa15baeb23c6ac0cbbe732b4d4cfe8a57b..c9557fa931bb84d09d1542b3feb8dc64349391f6 100644 (file)
--- a/src/relation.h
+++ b/src/relation.h
@@ -4,7 +4,7 @@
 
 #include <Python.h>
 
-#include <satsolver/pool.h>
+#include <solv/pool.h>
 
 // Sat Relation object
 typedef struct {

diff --git a/src/repo.c b/src/repo.c
index db47c2b017229c1008cd7a532c6824f6ab1c62a9..4a8ab43c5e69d37fd8c74290897843eae81b8066 100644 (file)
--- a/src/repo.c
+++ b/src/repo.c
@@ -1,9 +1,9 @@
 
 #include <Python.h>
 #include <stdbool.h>
-#include <satsolver/repo.h>
-#include <satsolver/repo_solv.h>
-#include <satsolver/repo_write.h>
+#include <solv/repo.h>
+#include <solv/repo_solv.h>
+#include <solv/repo_write.h>
 
 #include "pool.h"
 #include "repo.h"

diff --git a/src/repo.h b/src/repo.h
index 2b89a3282dacf01743f010d381514faf9829ff4b..46894e6bf4add46ff3892b29743d235ea625e5f4 100644 (file)
--- a/src/repo.h
+++ b/src/repo.h
@@ -4,7 +4,7 @@
 
 #include <Python.h>
 
-#include <satsolver/repo.h>
+#include <solv/repo.h>
 
 // Sat Repo object
 typedef struct {

diff --git a/src/request.c b/src/request.c
index bd1ea50b471f023bb204abb15b73167e542b55bc..07e7b613dbe051128548a03c9b67ca6ffed49d33 100644 (file)
--- a/src/request.c
+++ b/src/request.c
@@ -4,7 +4,7 @@
 #include "request.h"
 #include "solvable.h"
 
-#include <satsolver/solver.h>
+#include <solv/solver.h>
 
 PyTypeObject RequestType = {
        PyObject_HEAD_INIT(NULL)

diff --git a/src/request.h b/src/request.h
index a8c93c301521756e6351dabbe8b89f5207994918..92869a008ee87dc284f7f4db94197cb705734389 100644 (file)
--- a/src/request.h
+++ b/src/request.h
@@ -4,7 +4,7 @@
 
 #include <Python.h>
 
-#include <satsolver/queue.h>
+#include <solv/queue.h>
 
 // Sat Request object
 typedef struct {

diff --git a/src/solution.c b/src/solution.c
index 469cb32f456302e71562e005605ae6e438f37bcc..0fae131b0e203278dc941abdb2e96b9d7d14d0c8 100644 (file)
--- a/src/solution.c
+++ b/src/solution.c
@@ -1,8 +1,8 @@
 
 #include <Python.h>
 
-#include <satsolver/policy.h>
-#include <satsolver/solverdebug.h>
+#include <solv/policy.h>
+#include <solv/solverdebug.h>
 
 #include "config.h"
 #include "problem.h"

diff --git a/src/solvable.c b/src/solvable.c
index 602db60125ad00c740c83db32f178f8cd5aff7b0..e89c485ab139ff38f3cb5a33bff15d5a7686a55e 100644 (file)
--- a/src/solvable.c
+++ b/src/solvable.c
@@ -44,7 +44,7 @@ PyObject* Solvable_new(PyTypeObject *type, PyObject *args, PyObject *kwds) {
                solv->arch = pool_str2id(self->_pool, arch, 1);
 
                /* add self-provides */
-               Id rel = rel2id(self->_pool, solv->name, solv->evr, REL_EQ, 1);
+               Id rel = pool_rel2id(self->_pool, solv->name, solv->evr, REL_EQ, 1);
                solv->provides = repo_addid_dep(repo->_repo, solv->provides, rel, 0);
        }
 

diff --git a/src/solvable.h b/src/solvable.h
index 5ff6daa97a4ebb66752fd59d3d8710ddff5dec46..bd82be12e219c58e5689e8a7694a0108e505c16c 100644 (file)
--- a/src/solvable.h
+++ b/src/solvable.h
@@ -4,7 +4,7 @@
 
 #include <Python.h>
 
-#include <satsolver/solvable.h>
+#include <solv/solvable.h>
 
 // Sat Solvable object
 typedef struct {

diff --git a/src/solver.c b/src/solver.c
index 7962d2ff4edaa62d6984e0bac4f66b16a9745694..ee2cb137816ecaf3ecccd6586b71d5a655f1590b 100644 (file)
--- a/src/solver.c
+++ b/src/solver.c
@@ -4,7 +4,7 @@
 #include "request.h"
 #include "solver.h"
 
-#include <satsolver/solverdebug.h>
+#include <solv/solverdebug.h>
 
 PyTypeObject SolverType = {
        PyObject_HEAD_INIT(NULL)

diff --git a/src/solver.h b/src/solver.h
index 38d9aba7a8e62c9db400ad75e459e0a2824ec61f..245edecec2fa39192eb347f69a821c11dfb97098 100644 (file)
--- a/src/solver.h
+++ b/src/solver.h
@@ -4,7 +4,7 @@
 
 #include <Python.h>
 
-#include <satsolver/solver.h>
+#include <solv/solver.h>
 
 // Sat Solver object
 typedef struct {

diff --git a/src/step.h b/src/step.h
index b5a016da0ad45ac4dcdbfc21db820dea825e69c2..07ce3317e7a392d5ae73b33aec0bdd2a3e16aa5a 100644 (file)
--- a/src/step.h
+++ b/src/step.h
@@ -4,8 +4,8 @@
 
 #include <Python.h>
 
-#include <satsolver/pool.h>
-#include <satsolver/transaction.h>
+#include <solv/pool.h>
+#include <solv/transaction.h>
 
 // Sat Step object
 typedef struct {

diff --git a/src/transaction.c b/src/transaction.c
index 05ac855cc10399bbbb6d2b87e73d527687d89536..1208aa303955fd5b7cd2a12f017433f1a2f21243 100644 (file)
--- a/src/transaction.c
+++ b/src/transaction.c
@@ -1,7 +1,7 @@
 
 #include <Python.h>
 
-#include <satsolver/transaction.h>
+#include <solv/transaction.h>
 
 #include "solver.h"
 #include "step.h"
@@ -33,12 +33,8 @@ PyObject* Transaction_new(PyTypeObject *type, PyObject *args, PyObject *kwds) {
                        return NULL;
                }
 
-               /* When the solver is freed we still need the transaction. For that,
-                  we copy it to be independent. */
-               self->_transaction = malloc(sizeof(Transaction));
-               memcpy(self->_transaction, &solver->_solver->trans, sizeof(Transaction));
-
-               // order the transaction right from the start.
+               // Create a new transaction from the solver and order it.
+               self->_transaction = solver_create_transaction(solver->_solver);
                transaction_order(self->_transaction, 0);
        }
 

diff --git a/src/transaction.h b/src/transaction.h
index 959c975c79d7cbe8829e04f0f5c65a6bd000cf0e..71e50c3bfd3bb97fe5ce04d3b061cfce4f92cdcc 100644 (file)
--- a/src/transaction.h
+++ b/src/transaction.h
@@ -4,7 +4,7 @@
 
 #include <Python.h>
 
-#include <satsolver/transaction.h>
+#include <solv/transaction.h>
 
 // Sat Transaction object
 typedef struct {

diff --git a/src/util.h b/src/util.h
index e43bc484a0a42470b909230ed9092530b6f0a163..efd72e015839881eff60649a0e7454b322d17171 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -4,7 +4,7 @@
 
 #include <Python.h>
 
-#include <satsolver/evr.h>
+#include <solv/evr.h>
 
 extern PyObject *version_compare(PyObject *self, PyObject *args);