Skip showing empty transactions.

diff --git a/pakfire/base.py b/pakfire/base.py
index 3381eb671332e9cb1b316acf457e67ff920f230b..f7f0f0bc74b407acf54544e08756c03dc2069600 100644 (file)
--- a/pakfire/base.py
+++ b/pakfire/base.py
@@ -147,6 +147,7 @@ class Pakfire(object):
                t = solver.solve(request)
 
                if not t:
+                       logging.info(_("Nothing to do"))
                        return
 
                # Ask if the user acknowledges the transaction.
@@ -188,6 +189,7 @@ class Pakfire(object):
 
                        # If solving was not possible, we exit here.
                        if not t:
+                               logging.info(_("Nothing to do"))
                                return
 
                        # Ask the user if this is okay.
@@ -217,6 +219,7 @@ class Pakfire(object):
                t = solver.solve(request, update=update)
 
                if not t:
+                       logging.info(_("Nothing to do"))
                        return
 
                # Ask the user if the transaction is okay.
@@ -237,6 +240,7 @@ class Pakfire(object):
                t = solver.solve(request, uninstall=True)
 
                if not t:
+                       logging.info(_("Nothing to do"))
                        return
 
                # Ask the user if okay.

diff --git a/pakfire/transaction.py b/pakfire/transaction.py
index 94e92d1a6665746e604d212ec5bb5bf4f57dd65d..171001b4029ba84a76ca054793ef927d8e03033e 100644 (file)
--- a/pakfire/transaction.py
+++ b/pakfire/transaction.py
@@ -43,7 +43,12 @@ class Transaction(object):
                # Save installsizechange.
                transaction.installsizechange = _transaction.get_installsizechange()
 
-               for step in _transaction.steps():
+               # Get all steps that need to be done from the solver.
+               steps = _transaction.steps()
+               if not steps:
+                       return
+
+               for step in steps:
                        action = step.get_type()
                        pkg = packages.SolvPackage(pakfire, step.get_solvable())
 

diff --git a/po/pakfire.pot b/po/pakfire.pot
index 31ba36705d3b9e99a701bcd0f9f7c87502ac3e37..9c457026ccf431fd4e6bc5c745d656671dd7ccb3 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-31 17:38+0000\n"
+"POT-Creation-Date: 2011-07-31 18:24+0000\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"
@@ -38,7 +38,12 @@ msgstr ""
 msgid "Downgrading"
 msgstr ""
 
-#: ../pakfire/base.py:177
+#: ../pakfire/base.py:150 ../pakfire/base.py:192 ../pakfire/base.py:222
+#: ../pakfire/base.py:243
+msgid "Nothing to do"
+msgstr ""
+
+#: ../pakfire/base.py:178
 msgid "There are no packages to install."
 msgstr ""
 
@@ -155,7 +160,7 @@ msgstr ""
 msgid "Cleanup all temporary files."
 msgstr ""
 
-#: ../pakfire/cli.py:239 ../pakfire/transaction.py:160
+#: ../pakfire/cli.py:239 ../pakfire/transaction.py:165
 msgid "Repository"
 msgstr ""
 
@@ -279,11 +284,11 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: ../pakfire/packages/base.py:73 ../pakfire/transaction.py:159
+#: ../pakfire/packages/base.py:73 ../pakfire/transaction.py:164
 msgid "Arch"
 msgstr ""
 
-#: ../pakfire/packages/base.py:74 ../pakfire/transaction.py:159
+#: ../pakfire/packages/base.py:74 ../pakfire/transaction.py:164
 msgid "Version"
 msgstr ""
 
@@ -291,7 +296,7 @@ msgstr ""
 msgid "Release"
 msgstr ""
 
-#: ../pakfire/packages/base.py:76 ../pakfire/transaction.py:160
+#: ../pakfire/packages/base.py:76 ../pakfire/transaction.py:165
 msgid "Size"
 msgstr ""
 
@@ -389,62 +394,62 @@ msgstr ""
 msgid "    Solutions:"
 msgstr ""
 
-#: ../pakfire/transaction.py:94
+#: ../pakfire/transaction.py:99
 msgid "Downloading packages:"
 msgstr ""
 
-#: ../pakfire/transaction.py:159
+#: ../pakfire/transaction.py:164
 msgid "Package"
 msgstr ""
 
-#: ../pakfire/transaction.py:164
+#: ../pakfire/transaction.py:169
 msgid "Installing:"
 msgstr ""
 
-#: ../pakfire/transaction.py:165
+#: ../pakfire/transaction.py:170
 msgid "Reinstalling:"
 msgstr ""
 
-#: ../pakfire/transaction.py:166
+#: ../pakfire/transaction.py:171
 msgid "Updating:"
 msgstr ""
 
-#: ../pakfire/transaction.py:167
+#: ../pakfire/transaction.py:172
 msgid "Downgrading:"
 msgstr ""
 
-#: ../pakfire/transaction.py:168
+#: ../pakfire/transaction.py:173
 msgid "Removing:"
 msgstr ""
 
-#: ../pakfire/transaction.py:174
+#: ../pakfire/transaction.py:179
 msgid "Transaction Summary"
 msgstr ""
 
-#: ../pakfire/transaction.py:181
+#: ../pakfire/transaction.py:186
 msgid "package"
 msgstr ""
 
-#: ../pakfire/transaction.py:187
+#: ../pakfire/transaction.py:192
 #, python-format
 msgid "Total download size: %s"
 msgstr ""
 
-#: ../pakfire/transaction.py:191
+#: ../pakfire/transaction.py:196
 #, python-format
 msgid "Installed size: %s"
 msgstr ""
 
-#: ../pakfire/transaction.py:193
+#: ../pakfire/transaction.py:198
 #, python-format
 msgid "Freed size: %s"
 msgstr ""
 
-#: ../pakfire/transaction.py:202
+#: ../pakfire/transaction.py:207
 msgid "Is this okay?"
 msgstr ""
 
-#: ../pakfire/transaction.py:208
+#: ../pakfire/transaction.py:213
 msgid "Running transaction"
 msgstr ""