From d4be0f06fd1103f50f1022377112d3d0888fc9fb Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 16 Aug 2022 16:54:57 +0000 Subject: [PATCH] pakfire: Drop interactive flag Signed-off-by: Michael Tremer --- src/_pakfire/pakfire.c | 10 ++-------- src/libpakfire/archive.c | 8 +++----- src/libpakfire/build.c | 2 +- src/libpakfire/include/pakfire/pakfire.h | 1 - src/libpakfire/pakfire.c | 17 ++--------------- src/libpakfire/transaction.c | 10 ++++------ src/libpakfire/ui.c | 10 ---------- 7 files changed, 12 insertions(+), 46 deletions(-) diff --git a/src/_pakfire/pakfire.c b/src/_pakfire/pakfire.c index b2b8e190..e80f1ffa 100644 --- a/src/_pakfire/pakfire.c +++ b/src/_pakfire/pakfire.c @@ -138,7 +138,6 @@ static int Pakfire_init(PakfireObject* self, PyObject* args, PyObject* kwds) { "path", "arch", "logger", - "interactive", "offline", "conf", "build", @@ -148,12 +147,11 @@ static int Pakfire_init(PakfireObject* self, PyObject* args, PyObject* kwds) { const char* path = NULL; const char* arch = NULL; const char* conf = NULL; - int interactive = 0; int offline = 0; int build = 0; - if (!PyArg_ParseTupleAndKeywords(args, kwds, "|zzOppzpO", kwlist, - &path, &arch, &self->callbacks.log, &interactive, &offline, &conf, &build, + if (!PyArg_ParseTupleAndKeywords(args, kwds, "|zzOpzpO", kwlist, + &path, &arch, &self->callbacks.log, &offline, &conf, &build, &self->callbacks.confirm)) return -1; @@ -171,10 +169,6 @@ static int Pakfire_init(PakfireObject* self, PyObject* args, PyObject* kwds) { int flags = 0; - // Enable interactive mode - if (interactive) - flags |= PAKFIRE_FLAGS_INTERACTIVE; - // Enable offline mode if (offline) flags |= PAKFIRE_FLAGS_OFFLINE; diff --git a/src/libpakfire/archive.c b/src/libpakfire/archive.c index 5e029ca1..2730698f 100644 --- a/src/libpakfire/archive.c +++ b/src/libpakfire/archive.c @@ -1000,11 +1000,9 @@ PAKFIRE_EXPORT int pakfire_archive_extract(struct pakfire_archive* archive, cons DEBUG(archive->pakfire, "Extracting %s to %s\n", archive->path, path); // Create a progressbar - if (pakfire_has_flag(archive->pakfire, PAKFIRE_FLAGS_INTERACTIVE)) { - r = pakfire_archive_extract_progressbar(archive, &progressbar); - if (r) - goto ERROR; - } + r = pakfire_archive_extract_progressbar(archive, &progressbar); + if (r) + goto ERROR; // Open payload payload = pakfire_archive_open_payload(archive, &a, &size); diff --git a/src/libpakfire/build.c b/src/libpakfire/build.c index 4883003c..e87f698d 100644 --- a/src/libpakfire/build.c +++ b/src/libpakfire/build.c @@ -800,7 +800,7 @@ static int pakfire_build_makefile(struct pakfire_build* build, const char* path) r = pakfire_build_stage(build, makefile, *stage); if (r) { // Drop to a shell for debugging - if (pakfire_has_flag(build->pakfire, PAKFIRE_FLAGS_INTERACTIVE)) + if (pakfire_has_flag(build->pakfire, PAKFIRE_BUILD_INTERACTIVE)) pakfire_build_shell(build); goto ERROR; diff --git a/src/libpakfire/include/pakfire/pakfire.h b/src/libpakfire/include/pakfire/pakfire.h index 3316c33b..5299abbd 100644 --- a/src/libpakfire/include/pakfire/pakfire.h +++ b/src/libpakfire/include/pakfire/pakfire.h @@ -43,7 +43,6 @@ enum pakfire_digests { #include enum pakfire_flags { - PAKFIRE_FLAGS_INTERACTIVE = (1 << 0), PAKFIRE_FLAGS_OFFLINE = (1 << 1), PAKFIRE_FLAGS_BUILD = (1 << 2), }; diff --git a/src/libpakfire/pakfire.c b/src/libpakfire/pakfire.c index 8e30665d..654bb7c4 100644 --- a/src/libpakfire/pakfire.c +++ b/src/libpakfire/pakfire.c @@ -741,15 +741,6 @@ PAKFIRE_EXPORT int pakfire_create(struct pakfire** pakfire, const char* path, DEBUG(p, " arch = %s\n", pakfire_get_arch(p)); DEBUG(p, " path = %s\n", pakfire_get_path(p)); - // Automatically disable interactive mode - if (pakfire_has_flag(p, PAKFIRE_FLAGS_INTERACTIVE)) { - if (pakfire_tty_is_noninteractive()) { - DEBUG(p, "Interactive mode disabled\n"); - - flags &= ~PAKFIRE_FLAGS_INTERACTIVE; - } - } - // Fetch sub UID/GIDs if (!pakfire_on_root(p)) { // UID @@ -854,12 +845,6 @@ PAKFIRE_EXPORT int pakfire_create(struct pakfire** pakfire, const char* path, if (r) goto ERROR; - // Setup build stuff - if (pakfire_has_flag(p, PAKFIRE_FLAGS_BUILD)) { - // Builds are never interactive - p->flags &= ~PAKFIRE_FLAGS_INTERACTIVE; - } - *pakfire = p; return 0; @@ -1460,8 +1445,10 @@ int pakfire_confirm(struct pakfire* pakfire, const char* message, const char* qu return 0; // Skip this, if running in non-interactive mode +#if 0 if (!pakfire_has_flag(pakfire, PAKFIRE_FLAGS_INTERACTIVE)) return 0; +#endif // Run callback return pakfire->callbacks.confirm( diff --git a/src/libpakfire/transaction.c b/src/libpakfire/transaction.c index 3070088f..e931268c 100644 --- a/src/libpakfire/transaction.c +++ b/src/libpakfire/transaction.c @@ -1268,12 +1268,10 @@ PAKFIRE_EXPORT int pakfire_transaction_run( char* dump = pakfire_transaction_dump(transaction, 80); // Check if we should continue - if (pakfire_has_flag(transaction->pakfire, PAKFIRE_FLAGS_INTERACTIVE)) { - r = pakfire_confirm(transaction->pakfire, dump, _("Is this okay? [y/N]")); - if (r) { - ERROR(transaction->pakfire, "Transaction aborted upon user request\n"); - goto ERROR; - } + r = pakfire_confirm(transaction->pakfire, dump, _("Is this okay? [y/N]")); + if (r) { + ERROR(transaction->pakfire, "Transaction aborted upon user request\n"); + goto ERROR; } // Write transaction dump to log diff --git a/src/libpakfire/ui.c b/src/libpakfire/ui.c index f62f6037..befb2ad1 100644 --- a/src/libpakfire/ui.c +++ b/src/libpakfire/ui.c @@ -77,10 +77,6 @@ END: static int pakfire_ui_enter_number(struct pakfire* pakfire, const char* question, unsigned int* choice, unsigned int min, unsigned int max) { - // Skip this, if running in non-interactive mode - if (!pakfire_has_flag(pakfire, PAKFIRE_FLAGS_INTERACTIVE)) - return 0; - char* line = NULL; size_t length = 0; char* remainder = NULL; @@ -212,12 +208,6 @@ int pakfire_ui_pick_solution(struct pakfire* pakfire, struct pakfire_request* re free(solutions); } - // Skip this, if running in non-interactive mode - if (!pakfire_has_flag(pakfire, PAKFIRE_FLAGS_INTERACTIVE)) { - r = 1; - goto ERROR; - } - unsigned int choice = 0; // Let the user choose which solution they want -- 2.47.3