Move transaction from repository module to pakfire module.

diff --git a/pakfire/satsolver.py b/pakfire/satsolver.py
index 5894bfe0aace54ac9e25ba3b923cbbac756e5311..1a10936397af7f6e6b988d9acd19bb5e14ddeac6 100644 (file)
--- a/pakfire/satsolver.py
+++ b/pakfire/satsolver.py
@@ -5,8 +5,7 @@ import logging
 import _pakfire
 from _pakfire import *
 
-# XXX maybe we can move this to the root
-import pakfire.repository.transaction
+import transaction
 
 class Request(_pakfire.Request):
        def install(self, what):
@@ -48,9 +47,8 @@ class Solver(object):
                # If the solver succeeded, we return the transaction and return.
                if res:
                        # Return a resulting Transaction.
-                       transaction = Transaction(self._solver)
+                       t = Transaction(self._solver)
 
-                       return pakfire.repository.transaction.Transaction.from_solver(self.pakfire,
-                               self, transaction)
+                       return transaction.Transaction.from_solver(self.pakfire, self, t)
 
                return res

diff --git a/pakfire/repository/transaction.py b/pakfire/transaction.py
similarity index 98%
rename from pakfire/repository/transaction.py
rename to pakfire/transaction.py
index 9c210ab73f602403a1bed6b603b3e4827b2a90f4..60d785eb528099f5e3ffb4f9cc88b21f4dd87799 100644 (file)
--- a/pakfire/repository/transaction.py
+++ b/pakfire/transaction.py
@@ -3,13 +3,13 @@
 import logging
 import os
 import progressbar
-import satsolver
 import sys
 
-import pakfire.packages as packages
-import pakfire.util as util
+import packages
+import satsolver
+import util
 
-from pakfire.i18n import _
+from i18n import _
 
 PKG_DUMP_FORMAT = " %-21s %-8s %-21s %-19s %5s "
 

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 041dfee3ad26c4649c4f9827505f9b850f7f364c..a9b36c9446da36b024222f388d527e768ac6b2fb 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -38,7 +38,7 @@ pakfire/repository/local.py
 pakfire/repository/metadata.py
 pakfire/repository/remote_old.py
 pakfire/repository/remote.py
-pakfire/repository/transaction.py
 pakfire/satsolver.py
 pakfire/server.py
+pakfire/transaction.py
 pakfire/util.py

diff --git a/po/pakfire.pot b/po/pakfire.pot
index 37a5155178535893ad7d6aa3d66b2e6532051bb3..44ac7d3ff6ce9a2e172347587bab1fe2391df9af 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-07-16 16:56+0200\n"
+"POT-Creation-Date: 2011-07-16 20:37+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"
@@ -122,7 +122,7 @@ msgstr ""
 msgid "List all currently enabled repositories."
 msgstr ""
 
-#: ../pakfire/cli.py:222 ../pakfire/repository/transaction.py:248
+#: ../pakfire/cli.py:222 ../pakfire/transaction.py:248
 msgid "Repository"
 msgstr ""
 
@@ -226,11 +226,11 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: ../pakfire/packages/base.py:70 ../pakfire/repository/transaction.py:247
+#: ../pakfire/packages/base.py:70 ../pakfire/transaction.py:247
 msgid "Arch"
 msgstr ""
 
-#: ../pakfire/packages/base.py:71 ../pakfire/repository/transaction.py:247
+#: ../pakfire/packages/base.py:71 ../pakfire/transaction.py:247
 msgid "Version"
 msgstr ""
 
@@ -238,7 +238,7 @@ msgstr ""
 msgid "Release"
 msgstr ""
 
-#: ../pakfire/packages/base.py:73 ../pakfire/repository/transaction.py:248
+#: ../pakfire/packages/base.py:73 ../pakfire/transaction.py:248
 msgid "Size"
 msgstr ""
 
@@ -300,74 +300,74 @@ msgstr ""
 msgid "Loading installed packages"
 msgstr ""
 
-#: ../pakfire/repository/transaction.py:103
+#: ../pakfire/transaction.py:103
 #, python-format
 msgid "Extracting: %s"
 msgstr ""
 
-#: ../pakfire/repository/transaction.py:106
+#: ../pakfire/transaction.py:106
 #, python-format
 msgid "Installing: %s"
 msgstr ""
 
-#: ../pakfire/repository/transaction.py:108
+#: ../pakfire/transaction.py:108
 #, python-format
 msgid "Reinstalling: %s"
 msgstr ""
 
-#: ../pakfire/repository/transaction.py:110
+#: ../pakfire/transaction.py:110
 #, python-format
 msgid "Updating: %s"
 msgstr ""
 
-#: ../pakfire/repository/transaction.py:112
+#: ../pakfire/transaction.py:112
 #, python-format
 msgid "Downgrading: %s"
 msgstr ""
 
-#: ../pakfire/repository/transaction.py:129
+#: ../pakfire/transaction.py:129
 #, python-format
 msgid "Removing: %s"
 msgstr ""
 
-#: ../pakfire/repository/transaction.py:247
+#: ../pakfire/transaction.py:247
 msgid "Package"
 msgstr ""
 
-#: ../pakfire/repository/transaction.py:252
+#: ../pakfire/transaction.py:252
 msgid "Installing:"
 msgstr ""
 
-#: ../pakfire/repository/transaction.py:253
+#: ../pakfire/transaction.py:253
 msgid "Reinstalling:"
 msgstr ""
 
-#: ../pakfire/repository/transaction.py:254
+#: ../pakfire/transaction.py:254
 msgid "Updating:"
 msgstr ""
 
-#: ../pakfire/repository/transaction.py:255
+#: ../pakfire/transaction.py:255
 msgid "Downgrading:"
 msgstr ""
 
-#: ../pakfire/repository/transaction.py:256
+#: ../pakfire/transaction.py:256
 msgid "Removing:"
 msgstr ""
 
-#: ../pakfire/repository/transaction.py:262
+#: ../pakfire/transaction.py:262
 msgid "Transaction Summary"
 msgstr ""
 
-#: ../pakfire/repository/transaction.py:269
+#: ../pakfire/transaction.py:269
 msgid "package"
 msgstr ""
 
-#: ../pakfire/repository/transaction.py:275
+#: ../pakfire/transaction.py:275
 #, python-format
 msgid "Total download size: %s"
 msgstr ""
 
-#: ../pakfire/repository/transaction.py:284
+#: ../pakfire/transaction.py:284
 msgid "Is this okay?"
 msgstr ""