From: Michael Tremer Date: Thu, 16 Mar 2023 08:11:23 +0000 (+0000) Subject: snapshots: Call it store/restore X-Git-Tag: 0.9.29~304 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=356d681198523dd47941b04a9f5e4720b33fcd81;p=pakfire.git snapshots: Call it store/restore Signed-off-by: Michael Tremer --- diff --git a/src/libpakfire/build.c b/src/libpakfire/build.c index 411964d98..e12ce63f0 100644 --- a/src/libpakfire/build.c +++ b/src/libpakfire/build.c @@ -1685,8 +1685,8 @@ static int pakfire_build_init(struct pakfire_build* build) { // Update the snapshot if there were changes if (!pakfire_build_has_flag(build, PAKFIRE_BUILD_DISABLE_SNAPSHOT) && snapshot_needs_update) { - // Create a new snapshot - r = pakfire_snapshot_create(build->pakfire); + // Store the snapshot + r = pakfire_snapshot_store(build->pakfire); if (r) return r; } diff --git a/src/libpakfire/include/pakfire/snapshot.h b/src/libpakfire/include/pakfire/snapshot.h index 3a8e75677..7fb5b6d01 100644 --- a/src/libpakfire/include/pakfire/snapshot.h +++ b/src/libpakfire/include/pakfire/snapshot.h @@ -27,7 +27,7 @@ #include -int pakfire_snapshot_create(struct pakfire* pakfire); +int pakfire_snapshot_store(struct pakfire* pakfire); int pakfire_snapshot_restore(struct pakfire* pakfire); int pakfire_snapshot_compress(struct pakfire* pakfire, FILE* f); diff --git a/src/libpakfire/snapshot.c b/src/libpakfire/snapshot.c index c4dc8fd64..fcc3de234 100644 --- a/src/libpakfire/snapshot.c +++ b/src/libpakfire/snapshot.c @@ -137,7 +137,7 @@ int pakfire_snapshot_compress(struct pakfire* pakfire, FILE* f) { } // Write the payload to the archive - r = pakfire_compress(pakfire, archive, filelist, _("Writing snapshot..."), + r = pakfire_compress(pakfire, archive, filelist, _("Storing Snapshot"), PAKFIRE_COMPRESS_SHOW_THROUGHPUT, 0); if (r) goto ERROR; @@ -161,7 +161,7 @@ ERROR: return r; } -int pakfire_snapshot_create(struct pakfire* pakfire) { +int pakfire_snapshot_store(struct pakfire* pakfire) { FILE* f = NULL; char tmppath[PATH_MAX]; char path[PATH_MAX]; @@ -245,7 +245,7 @@ int pakfire_snapshot_extract(struct pakfire* pakfire, FILE* f) { // Extract snapshot r = pakfire_extract(pakfire, archive, st.st_size, NULL, NULL, - _("Extracting snapshot..."), NULL, PAKFIRE_EXTRACT_SHOW_THROUGHPUT); + _("Restoring Snapshot"), NULL, PAKFIRE_EXTRACT_SHOW_THROUGHPUT); if (r) goto ERROR;