summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhaedrus Leeds <mwleeds@protonmail.com>2023-01-02 18:24:29 -0800
committerPatrick <tingping@tingping.se>2023-01-02 20:45:19 -0600
commit523cedc27509779e7e815806e53361d5fe7e0bd4 (patch)
tree43f90ec0c84ec1027e0d9099062e4b5e05c6e9b2
parent8ca1604a94dc6a62880263141448f6688cb03205 (diff)
downloadflatpak-523cedc27509779e7e815806e53361d5fe7e0bd4.tar.gz
trivial: Trim some long lines, etc.
-rw-r--r--app/flatpak-builtins-repair.c34
1 files changed, 22 insertions, 12 deletions
diff --git a/app/flatpak-builtins-repair.c b/app/flatpak-builtins-repair.c
index 0248bc44..eeb7f633 100644
--- a/app/flatpak-builtins-repair.c
+++ b/app/flatpak-builtins-repair.c
@@ -357,11 +357,14 @@ flatpak_builtin_repair (int argc, char **argv, GCancellable *cancellable, GError
* + Verify the commits they point to and all object they reference:
* + Remove any invalid objects
* + Note any missing objects
- * + Any refs that had invalid object, or non-partial refs that had missing objects are removed
- * + prune (depth=0) all object not references by a ref, which gets rid of any possibly invalid non-scanned objects
+ * + Any refs that had invalid object, or non-partial refs that had missing
+ * objects are removed
+ * + Prune (depth=0) all object not references by a ref, which gets rid of
+ * any possibly invalid non-scanned objects
* * Remove leftover .removed contents
* + Enumerate all deployed refs:
- * + if they are not in the repo (or is partial for a non-subdir deploy), re-install them (pull + deploy)
+ * If they are not in the repo (or is partial for a non-subdir deploy),
+ * re-install them (pull + deploy)
*/
if (!flatpak_dir_delete_mirror_refs (dir, opt_dry_run, cancellable, error))
@@ -401,7 +404,8 @@ flatpak_builtin_repair (int argc, char **argv, GCancellable *cancellable, GError
if (!opt_dry_run)
{
g_print (_("Removing non-deployed ref %s…\n"), refspec);
- (void) ostree_repo_set_ref_immediate (repo, remote, ref_name, NULL, cancellable, NULL);
+ (void) ostree_repo_set_ref_immediate (repo, remote, ref_name, NULL,
+ cancellable, NULL);
}
else
g_print (_("Skipping non-deployed ref %s…\n"), refspec);
@@ -409,12 +413,16 @@ flatpak_builtin_repair (int argc, char **argv, GCancellable *cancellable, GError
continue;
}
- /* When printing progress, we have to print a newline character at the end, otherwise errors printing in
- sections of the code that we don't control won't have a leading newline. Therefore, the status line will
- always print a trailing newline, and here we just go up a line back onto the previous progress line.
+ /* When printing progress, we have to print a newline character at the end,
+ * otherwise errors printing in sections of the code that we don't control
+ * won't have a leading newline. Therefore, the status line will always
+ * print a trailing newline, and here we just go up a line back onto the
+ * previous progress line.
- This does also mean that other areas of this code section that print errors will need to print a trailing
- newline as well, otherwise the output will overwrite any errors. */
+ * This does also mean that other areas of this code section that print
+ * errors will need to print a trailing newline as well, otherwise the
+ * output will overwrite any errors.
+ */
if (flatpak_fancy_output () && i != 1)
g_print ("\033[A\r\033[K");
@@ -442,10 +450,12 @@ flatpak_builtin_repair (int argc, char **argv, GCancellable *cancellable, GError
}
if (!opt_dry_run)
- (void) ostree_repo_set_ref_immediate (repo, remote, ref_name, NULL, cancellable, NULL);
+ (void) ostree_repo_set_ref_immediate (repo, remote, ref_name, NULL,
+ cancellable, NULL);
- /* If using fancy output, print another trailing newline, so the next progress line won't overwrite
- these errors. */
+ /* If using fancy output, print another trailing newline, so the next
+ * progress line won't overwrite these errors.
+ */
if (flatpak_fancy_output () && i < g_hash_table_size (all_refs))
g_print ("\n");
}