libpakfire: Drop pakfire_activate/deactivate

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

diff --git a/src/libpakfire/execute.c b/src/libpakfire/execute.c
index c77b34e85d6cfce22c20a477943fa9f7ffed90cb..4bda89417f283fc1006c47d5d695f0476b9073e1 100644 (file)
--- a/src/libpakfire/execute.c
+++ b/src/libpakfire/execute.c
@@ -367,22 +367,15 @@ PAKFIRE_EXPORT int pakfire_execute(Pakfire pakfire, const char* argv[], char* en
                }
        }
 
-       // Activate
-       int r = pakfire_activate(pakfire);
-       if (r)
-               return r;
-
        // Fork this process
        pid_t pid = clone(pakfire_execute_fork, stack + sizeof(stack), cflags, &env);
        if (pid < 0) {
                ERROR(pakfire, "Could not fork: %s\n", strerror(errno));
-               pakfire_deactivate(pakfire);
-
                return -errno;
        }
 
        // Set some useful error code
-       r = -ESRCH;
+       int r = -ESRCH;
        int status = 0;
 
        DEBUG(pakfire, "Waiting for PID %d to finish its work\n", pid);
@@ -402,9 +395,6 @@ PAKFIRE_EXPORT int pakfire_execute(Pakfire pakfire, const char* argv[], char* en
        if (!status)
                waitpid(pid, &status, 0);
 
-       // Deactivate
-       pakfire_deactivate(pakfire);
-
        if (WIFEXITED(status)) {
                r = WEXITSTATUS(status);
 
@@ -439,11 +429,6 @@ PAKFIRE_EXPORT int pakfire_execute_script(Pakfire pakfire, const char* script, c
        char* path = pakfire_path_join(root, "tmp/.pakfire-script.XXXXXX");
        int r;
 
-       // Activate
-       r = pakfire_activate(pakfire);
-       if (r)
-               return r;
-
        // Open a temporary file
        int fd = mkstemp(path);
        if (fd < 0) {
@@ -499,9 +484,6 @@ out:
        // Remove script from disk
        unlink(path);
 
-       // Deactivate
-       pakfire_deactivate(pakfire);
-
        // Cleanup
        free(path);
 

diff --git a/src/libpakfire/include/pakfire/pakfire.h b/src/libpakfire/include/pakfire/pakfire.h
index 091135c16456c6359f30351b53f463466b0be637..1cea5d149fc4da0995ed7f74fe540b646c082256 100644 (file)
--- a/src/libpakfire/include/pakfire/pakfire.h
+++ b/src/libpakfire/include/pakfire/pakfire.h
@@ -37,8 +37,6 @@ Pakfire pakfire_unref(Pakfire pakfire);
 const char* pakfire_get_path(Pakfire pakfire);
 char* pakfire_make_path(Pakfire pakfire, const char* path);
 
-int pakfire_activate(Pakfire pakfire);
-int pakfire_deactivate(Pakfire pakfire);
 int pakfire_bind(Pakfire pakfire, const char* src, const char* dst, int flags);
 
 const char* pakfire_get_arch(Pakfire pakfire);

diff --git a/src/libpakfire/libpakfire.sym b/src/libpakfire/libpakfire.sym
index 3bbd4cca76e424fa1ddc9351f8046a29a5d971bc..45838159f8738c4e2480aec902d9c57959568e61 100644 (file)
--- a/src/libpakfire/libpakfire.sym
+++ b/src/libpakfire/libpakfire.sym
@@ -21,11 +21,9 @@
 LIBPAKFIRE_0 {
 global:
        # pakfire
-       pakfire_activate;
        pakfire_bind;
        pakfire_count_packages;
        pakfire_create;
-       pakfire_deactivate;
        pakfire_execute;
        pakfire_execute_command;
        pakfire_execute_script;

diff --git a/src/libpakfire/pakfire.c b/src/libpakfire/pakfire.c
index 074acc960374898166a1c7e13a3f9abb7e4db323..bca06dd637b042bb6df4104e95239a126d68eddc 100644 (file)
--- a/src/libpakfire/pakfire.c
+++ b/src/libpakfire/pakfire.c
@@ -71,7 +71,6 @@ struct _Pakfire {
        pakfire_log_function_t log_function;
        int log_priority;
 
-       int activated;
        int nrefs;
 
        STAILQ_HEAD(mountpoints, mountpoint) mountpoints;
@@ -538,14 +537,6 @@ ERROR:
        return r;
 }
 
-PAKFIRE_EXPORT int pakfire_activate(Pakfire pakfire) {
-       return 0;
-}
-
-PAKFIRE_EXPORT int pakfire_deactivate(Pakfire pakfire) {
-       return 0;
-}
-
 PAKFIRE_EXPORT const char* pakfire_get_arch(Pakfire pakfire) {
        return pakfire->arch;
 }

diff --git a/src/libpakfire/transaction.c b/src/libpakfire/transaction.c
index a3072f350aa0d2317bb9f26cd156f2a4b2a640a5..98fab2e675a961e6280a90725a7ab45d23593ea8 100644 (file)
--- a/src/libpakfire/transaction.c
+++ b/src/libpakfire/transaction.c
@@ -388,11 +388,6 @@ PAKFIRE_EXPORT int pakfire_transaction_run(PakfireTransaction transaction) {
 
        DEBUG(transaction->pakfire, "Running Transaction %p\n", transaction);
 
-       // Activate Pakfire
-       r = pakfire_activate(transaction->pakfire);
-       if (r)
-               return r;
-
        // Open the database
        r = pakfire_db_open(&db, transaction->pakfire, PAKFIRE_DB_READWRITE);
        if (r) {
@@ -425,9 +420,6 @@ ERROR:
        // Free the database
        pakfire_db_unref(db);
 
-       // Deactivate Pakfire
-       pakfire_deactivate(transaction->pakfire);
-
        return r;
 }