Add reinstall & obsoletes step types

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/libpakfire/include/pakfire/step.h b/src/libpakfire/include/pakfire/step.h
index 06efdc22eb4820c255f1ca8e71b0230e4ae10c6f..7e659c4d8f7c3fa8fc6a05f90f4e99d2100738da 100644 (file)
--- a/src/libpakfire/include/pakfire/step.h
+++ b/src/libpakfire/include/pakfire/step.h
@@ -29,9 +29,11 @@
 typedef enum _pakfire_step_types {
        PAKFIRE_STEP_IGNORE = 0,
        PAKFIRE_STEP_INSTALL,
+       PAKFIRE_STEP_REINSTALL,
        PAKFIRE_STEP_ERASE,
        PAKFIRE_STEP_UPGRADE,
        PAKFIRE_STEP_DOWNGRADE,
+       PAKFIRE_STEP_OBSOLETE,
 } pakfire_step_type;
 
 PakfireStep pakfire_step_create(PakfireTransaction transaction, Id id);

diff --git a/src/libpakfire/step.c b/src/libpakfire/step.c
index 04800f320404fced4f352fcf7393cb38411bc52b..7c8c9aaf19156c7d63d037a681040642bfc9147b 100644 (file)
--- a/src/libpakfire/step.c
+++ b/src/libpakfire/step.c
@@ -60,9 +60,11 @@ pakfire_step_type pakfire_step_get_type(PakfireStep step) {
        switch (type) {
                case SOLVER_TRANSACTION_INSTALL:
                case SOLVER_TRANSACTION_MULTIINSTALL:
+                       return PAKFIRE_STEP_INSTALL;
+
                case SOLVER_TRANSACTION_REINSTALL:
                case SOLVER_TRANSACTION_MULTIREINSTALL:
-                       return PAKFIRE_STEP_INSTALL;
+                       return PAKFIRE_STEP_REINSTALL;
 
                case SOLVER_TRANSACTION_ERASE:
                        return PAKFIRE_STEP_ERASE;
@@ -73,6 +75,9 @@ pakfire_step_type pakfire_step_get_type(PakfireStep step) {
                case SOLVER_TRANSACTION_UPGRADE:
                        return PAKFIRE_STEP_UPGRADE;
 
+               case SOLVER_TRANSACTION_OBSOLETES:
+                       return PAKFIRE_STEP_OBSOLETE;
+
                // Anything we don't care about
                case SOLVER_TRANSACTION_IGNORE:
                case SOLVER_TRANSACTION_REINSTALLED:
@@ -89,6 +94,9 @@ const char* pakfire_step_get_type_string(PakfireStep step) {
                case PAKFIRE_STEP_INSTALL:
                        return "install";
 
+               case PAKFIRE_STEP_REINSTALL:
+                       return "reinstall";
+
                case PAKFIRE_STEP_ERASE:
                        return "erase";
 
@@ -98,6 +106,9 @@ const char* pakfire_step_get_type_string(PakfireStep step) {
                case PAKFIRE_STEP_UPGRADE:
                        return "upgrade";
 
+               case PAKFIRE_STEP_OBSOLETE:
+                       return "obsolete";
+
                case PAKFIRE_STEP_IGNORE:
                default:
                        return NULL;
@@ -109,6 +120,7 @@ static int pakfire_step_get_downloadtype(PakfireStep step) {
 
        switch (type) {
                case PAKFIRE_STEP_INSTALL:
+               case PAKFIRE_STEP_REINSTALL:
                case PAKFIRE_STEP_DOWNGRADE:
                case PAKFIRE_STEP_UPGRADE:
                        return 1;

diff --git a/src/libpakfire/transaction.c b/src/libpakfire/transaction.c
index 5a7c0e78220aed9c46902b40b6275d346fb96459..8074fe03edb14cb57e03ca430d3541b4837d1f27 100644 (file)
--- a/src/libpakfire/transaction.c
+++ b/src/libpakfire/transaction.c
@@ -166,7 +166,7 @@ static void pakfire_transaction_add_separator(char** str, size_t width) {
 }
 
 static size_t pakfire_transaction_add_section(char** str, size_t width, PakfireTransaction transaction,
-               const char* headline, int type) {
+               const char* headline, pakfire_step_type type) {
        PakfirePackageList list = pakfire_transaction_get_packages(transaction, type);
 
        // Nothing to do if there are no packages in this stage
@@ -221,17 +221,17 @@ char* pakfire_transaction_dump(PakfireTransaction transaction, size_t width) {
 
        // Show what we are doing
        size_t installing = pakfire_transaction_add_section(&string, width, transaction,
-               _("Installing:"), SOLVER_TRANSACTION_INSTALL);
+               _("Installing:"), PAKFIRE_STEP_INSTALL);
        size_t reinstalling = pakfire_transaction_add_section(&string, width, transaction,
-               _("Reinstalling:"), SOLVER_TRANSACTION_REINSTALL);
+               _("Reinstalling:"), PAKFIRE_STEP_REINSTALL);
        size_t updating = pakfire_transaction_add_section(&string, width, transaction,
-               _("Updating:"), SOLVER_TRANSACTION_UPGRADE);
+               _("Updating:"), PAKFIRE_STEP_UPGRADE);
        size_t downgrading = pakfire_transaction_add_section(&string, width, transaction,
-               _("Downgrading:"), SOLVER_TRANSACTION_DOWNGRADE);
+               _("Downgrading:"), PAKFIRE_STEP_DOWNGRADE);
        size_t removing = pakfire_transaction_add_section(&string, width, transaction,
-               _("Removing:"), SOLVER_TRANSACTION_ERASE);
+               _("Removing:"), PAKFIRE_STEP_ERASE);
        size_t obsoleting = pakfire_transaction_add_section(&string, width, transaction,
-               _("Obsoleting:"), SOLVER_TRANSACTION_OBSOLETES);
+               _("Obsoleting:"), PAKFIRE_STEP_OBSOLETE);
 
        // Summary
        pakfire_transaction_add_headline(&string, width, _("Transaction Summary"));