scm-commits August 2016

scm-commits@lists.fedoraproject.org

1 participants
16798 discussions

walters pushed to ostree (f24). "Add pending patch to fix date-based pruning"
by notifications＠fedoraproject.org 31 Aug '16

31 Aug '16

1 0

walters pushed to ostree (f24). "Add pending patch to fix date-based pruning"
by notifications＠fedoraproject.org 31 Aug '16

31 Aug '16

From 40751de96a2e461867ab5d98221cfa4422d6dd06 Mon Sep 17 00:00:00 2001 From: Colin Walters <walters(a)verbum.org> Date: Mon, 8 Aug 2016 20:53:54 -0400 Subject: Add pending patch to fix date-based pruning --- 0001-delta-Add-if-not-exists-option.patch | 178 ------------------------------ ostree.spec | 1 - 2 files changed, 179 deletions(-) delete mode 100644 0001-delta-Add-if-not-exists-option.patch diff --git a/0001-delta-Add-if-not-exists-option.patch b/0001-delta-Add-if-not-exists-option.patch deleted file mode 100644 index fc157ed..0000000 --- a/0001-delta-Add-if-not-exists-option.patch +++ /dev/null @@ -1,178 +0,0 @@ -From 0d07c7ecdee251bb821ddebd4f8555bdcfd1d089 Mon Sep 17 00:00:00 2001 -From: Colin Walters <walters(a)verbum.org> -Date: Fri, 1 Jul 2016 14:39:49 -0400 -Subject: [PATCH] delta: Add --if-not-exists option - -I often want to have "idempotent" systems that iterate to a known -state. If after generating a commit, the system is interrupted, I'd -like the next run to still generate a delta. But we don't want to -regenerate if one exists, hence this option. - -Closes: #375 -Approved by: jlebon ---- - src/libostree/ostree-cmdprivate.c | 1 + - src/libostree/ostree-cmdprivate.h | 1 + - src/libostree/ostree-repo-static-delta-core.c | 33 ++++++++++++++++++++++++ - src/libostree/ostree-repo-static-delta-private.h | 7 +++++ - src/ostree/ot-builtin-static-delta.c | 16 ++++++++++++ - tests/test-delta.sh | 9 ++++++- - 6 files changed, 66 insertions(+), 1 deletion(-) - -diff --git a/src/libostree/ostree-cmdprivate.c b/src/libostree/ostree-cmdprivate.c -index 2c85bb4..4367b49 100644 ---- a/src/libostree/ostree-cmdprivate.c -+++ b/src/libostree/ostree-cmdprivate.c -@@ -47,6 +47,7 @@ ostree_cmd__private__ (void) - static OstreeCmdPrivateVTable table = { - impl_ostree_generate_grub2_config, - _ostree_repo_static_delta_dump, -+ _ostree_repo_static_delta_query_exists, - _ostree_repo_static_delta_delete - }; - -diff --git a/src/libostree/ostree-cmdprivate.h b/src/libostree/ostree-cmdprivate.h -index 9a74ead..8d1c653 100644 ---- a/src/libostree/ostree-cmdprivate.h -+++ b/src/libostree/ostree-cmdprivate.h -@@ -27,6 +27,7 @@ G_BEGIN_DECLS - typedef struct { - gboolean (* ostree_generate_grub2_config) (OstreeSysroot *sysroot, int bootversion, int target_fd, GCancellable *cancellable, GError **error); - gboolean (* ostree_static_delta_dump) (OstreeRepo *repo, const char *delta_id, GCancellable *cancellable, GError **error); -+ gboolean (* ostree_static_delta_query_exists) (OstreeRepo *repo, const char *delta_id, gboolean *out_exists, GCancellable *cancellable, GError **error); - gboolean (* ostree_static_delta_delete) (OstreeRepo *repo, const char *delta_id, GCancellable *cancellable, GError **error); - } OstreeCmdPrivateVTable; - -diff --git a/src/libostree/ostree-repo-static-delta-core.c b/src/libostree/ostree-repo-static-delta-core.c -index 6253a45..b730c40 100644 ---- a/src/libostree/ostree-repo-static-delta-core.c -+++ b/src/libostree/ostree-repo-static-delta-core.c -@@ -820,6 +820,39 @@ _ostree_repo_static_delta_delete (OstreeRepo *self, - } - - gboolean -+_ostree_repo_static_delta_query_exists (OstreeRepo *self, -+ const char *delta_id, -+ gboolean *out_exists, -+ GCancellable *cancellable, -+ GError **error) -+{ -+ gboolean ret = FALSE; -+ g_autofree char *from = NULL; -+ g_autofree char *to = NULL; -+ g_autofree char *superblock_path = NULL; -+ struct stat stbuf; -+ -+ _ostree_parse_delta_name (delta_id, &from, &to); -+ superblock_path = _ostree_get_relative_static_delta_superblock_path (from, to); -+ -+ if (fstatat (self->repo_dir_fd, superblock_path, &stbuf, 0) < 0) -+ { -+ if (errno == ENOENT) -+ { -+ *out_exists = FALSE; -+ return TRUE; -+ } -+ else -+ { -+ glnx_set_error_from_errno (error); -+ return FALSE; -+ } -+ } -+ *out_exists = TRUE; -+ return TRUE; -+} -+ -+gboolean - _ostree_repo_static_delta_dump (OstreeRepo *self, - const char *delta_id, - GCancellable *cancellable, -diff --git a/src/libostree/ostree-repo-static-delta-private.h b/src/libostree/ostree-repo-static-delta-private.h -index eeb99c3..31e8971 100644 ---- a/src/libostree/ostree-repo-static-delta-private.h -+++ b/src/libostree/ostree-repo-static-delta-private.h -@@ -191,6 +191,13 @@ _ostree_delta_compute_similar_objects (OstreeRepo *repo, - GError **error); - - gboolean -+_ostree_repo_static_delta_query_exists (OstreeRepo *repo, -+ const char *delta_id, -+ gboolean *out_exists, -+ GCancellable *cancellable, -+ GError **error); -+ -+gboolean - _ostree_repo_static_delta_dump (OstreeRepo *repo, - const char *delta_id, - GCancellable *cancellable, -diff --git a/src/ostree/ot-builtin-static-delta.c b/src/ostree/ot-builtin-static-delta.c -index 09eb90a..90702c5 100644 ---- a/src/ostree/ot-builtin-static-delta.c -+++ b/src/ostree/ot-builtin-static-delta.c -@@ -37,6 +37,7 @@ static gboolean opt_empty; - static gboolean opt_swap_endianness; - static gboolean opt_inline; - static gboolean opt_disable_bsdiff; -+static gboolean opt_if_not_exists; - - #define BUILTINPROTO(name) static gboolean ot_static_delta_builtin_ ## name (int argc, char **argv, GCancellable *cancellable, GError **error) - -@@ -64,6 +65,7 @@ static GOptionEntry generate_options[] = { - { "inline", 0, 0, G_OPTION_ARG_NONE, &opt_inline, "Inline delta parts into main delta", NULL }, - { "to", 0, 0, G_OPTION_ARG_STRING, &opt_to_rev, "Create delta to revision REV", "REV" }, - { "disable-bsdiff", 0, 0, G_OPTION_ARG_NONE, &opt_disable_bsdiff, "Disable use of bsdiff", NULL }, -+ { "if-not-exists", 'n', 0, G_OPTION_ARG_NONE, &opt_if_not_exists, "Only generate if a delta does not already exist", NULL }, - { "set-endianness", 0, 0, G_OPTION_ARG_STRING, &opt_endianness, "Choose metadata endianness ('l' or 'B')", "ENDIAN" }, - { "swap-endianness", 0, 0, G_OPTION_ARG_NONE, &opt_swap_endianness, "Swap metadata endianness from host order", NULL }, - { "min-fallback-size", 0, 0, G_OPTION_ARG_STRING, &opt_min_fallback_size, "Minimum uncompressed size in megabytes for individual HTTP request", NULL}, -@@ -264,6 +266,20 @@ ot_static_delta_builtin_generate (int argc, char **argv, GCancellable *cancellab - } - if (!ostree_repo_resolve_rev (repo, opt_to_rev, FALSE, &to_resolved, error)) - goto out; -+ -+ if (opt_if_not_exists) -+ { -+ gboolean does_exist; -+ g_autofree char *delta_id = from_resolved ? g_strconcat (from_resolved, "-", to_resolved, NULL) : g_strdup (to_resolved); -+ if (!ostree_cmd__private__ ()->ostree_static_delta_query_exists (repo, delta_id, &does_exist, cancellable, error)) -+ goto out; -+ if (does_exist) -+ { -+ g_print ("Delta %s already exists.\n", delta_id); -+ ret = TRUE; -+ goto out; -+ } -+ } - - if (opt_endianness) - { -diff --git a/tests/test-delta.sh b/tests/test-delta.sh -index 4b2b879..bd735c4 100755 ---- a/tests/test-delta.sh -+++ b/tests/test-delta.sh -@@ -82,6 +82,8 @@ get_assert_one_direntry_matching() { - origrev=$(${CMD_PREFIX} ostree --repo=repo rev-parse test) - - ${CMD_PREFIX} ostree --repo=repo static-delta generate --empty --to=${origrev} -+${CMD_PREFIX} ostree --repo=repo static-delta generate --if-not-exists --empty --to=${origrev} > out.txt -+assert_file_has_content out.txt "${origrev} already exists" - ${CMD_PREFIX} ostree --repo=repo static-delta list | grep ${origrev} || exit 1 - ${CMD_PREFIX} ostree --repo=repo prune - ${CMD_PREFIX} ostree --repo=repo static-delta list | grep ${origrev} || exit 1 -@@ -91,7 +93,12 @@ ${CMD_PREFIX} ostree --repo=repo commit -b test -s test --tree=dir=files - - newrev=$(${CMD_PREFIX} ostree --repo=repo rev-parse test) - --${CMD_PREFIX} ostree --repo=repo static-delta generate --from=${origrev} --to=${newrev} --inline -+${CMD_PREFIX} ostree --repo=repo static-delta generate --if-not-exists --from=${origrev} --to=${newrev} --inline -+${CMD_PREFIX} ostree --repo=repo static-delta generate --if-not-exists --from=${origrev} --to=${newrev} --inline > out.txt -+assert_file_has_content out.txt "${origrev}-${newrev} already exists" -+# Should regenerate -+${CMD_PREFIX} ostree --repo=repo static-delta generate --from=${origrev} --to=${newrev} --inline > out.txt -+assert_not_file_has_content out.txt "${origrev}-${newrev} already exists" - - deltaprefix=$(get_assert_one_direntry_matching repo/deltas '.') - deltadir=$(get_assert_one_direntry_matching repo/deltas/${deltaprefix} '-') --- -2.7.4 - diff --git a/ostree.spec b/ostree.spec index 9e18782..d269183 100644 --- a/ostree.spec +++ b/ostree.spec @@ -8,7 +8,6 @@ Source1: 91-ostree.preset License: LGPLv2+ URL: http://live.gnome.org/OSTree -Patch0: 0001-delta-Add-if-not-exists-option.patch Patch2: 0001-ostree-remount-Explicitly-set-tmp-to-01777.patch Patch3: 0001-prune-Retain-the-tip-of-each-ref-even-with-date-prun.patch -- cgit v0.12 http://pkgs.fedoraproject.org/cgit/ostree.git/commit/?h=f24&id=40751de96a2e…

1 0

walters pushed to ostree (f24). "files: Adapt to prepare-root move"
by notifications＠fedoraproject.org 31 Aug '16

31 Aug '16

From 1aa1345593223e7645d7327107369fde5167a889 Mon Sep 17 00:00:00 2001 From: Colin Walters <walters(a)verbum.org> Date: Thu, 11 Aug 2016 13:18:02 -0400 Subject: files: Adapt to prepare-root move --- ostree.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ostree.spec b/ostree.spec index 655d7ba..6557bc6 100644 --- a/ostree.spec +++ b/ostree.spec @@ -97,8 +97,6 @@ install -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system-pres %doc README.md %{_bindir}/ostree %{_bindir}/rofiles-fuse -%{_sbindir}/ostree-prepare-root -%{_sbindir}/ostree-remount %{_datadir}/ostree/trusted.gpg.d %{_sysconfdir}/ostree %{_sysconfdir}/dracut.conf.d/ostree.conf @@ -111,6 +109,9 @@ install -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system-pres %{_prefix}/lib/systemd/system-preset/91-ostree.preset %exclude %{_sysconfdir}/grub.d/*ostree %exclude %{_libexecdir}/ostree/grub2* +# Moved in git master +%{_prefix}/lib/ostree/ostree-prepare-root +%{_prefix}/lib/ostree/ostree-remount %files devel %{_libdir}/lib*.so -- cgit v0.12 http://pkgs.fedoraproject.org/cgit/ostree.git/commit/?h=f24&id=1aa134559322…

1 0

walters pushed to ostree (f24). "New upstream version"
by notifications＠fedoraproject.org 31 Aug '16

31 Aug '16

From e5d3a2866131ed5671ee15034c31b3702ce9e953 Mon Sep 17 00:00:00 2001 From: Colin Walters <walters(a)verbum.org> Date: Tue, 9 Aug 2016 16:02:00 -0400 Subject: New upstream version --- .gitignore | 1 + ostree.spec | 8 +++++--- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6d371ee..cb0dfa3 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ /ostree-2016.5.tar.xz /ostree-2016.6.tar.xz /ostree-2016.7.tar.xz +/ostree-2016.8.tar.xz diff --git a/ostree.spec b/ostree.spec index d269183..655d7ba 100644 --- a/ostree.spec +++ b/ostree.spec @@ -1,7 +1,7 @@ Summary: Tool for managing bootable, immutable filesystem trees Name: ostree -Version: 2016.7 -Release: 4%{?dist} +Version: 2016.8 +Release: 1%{?dist} #VCS: git:git://git.gnome.org/ostree Source0: https://github.com/ostreedev/%{name}/releases/download/v%{version}/%{name}-… Source1: 91-ostree.preset @@ -9,7 +9,6 @@ License: LGPLv2+ URL: http://live.gnome.org/OSTree Patch2: 0001-ostree-remount-Explicitly-set-tmp-to-01777.patch -Patch3: 0001-prune-Retain-the-tip-of-each-ref-even-with-date-prun.patch BuildRequires: git # We always run autogen.sh @@ -128,6 +127,9 @@ install -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system-pres %endif %changelog +* Tue Aug 09 2016 walters(a)redhat.com - 2016.8-1 +- New upstream version + * Tue Aug 09 2016 Colin Walters <walters(a)verbum.org> - 2016.7-4 - Add pending patch to fix date-based pruning diff --git a/sources b/sources index 7dd4dcb..30a0dd7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -08f4530d7ce13931fc17bd123f78ad2c ostree-2016.7.tar.xz +65786a0e60f96ca5c7f221632a9df375 ostree-2016.8.tar.xz -- cgit v0.12 http://pkgs.fedoraproject.org/cgit/ostree.git/commit/?h=f24&id=e5d3a2866131…

1 0

walters pushed to ostree (f25). "Merge branch 'master' into f25"
by notifications＠fedoraproject.org 31 Aug '16

31 Aug '16

From a84e41e0e6774cab216c35bb62193cd802ba21ae Mon Sep 17 00:00:00 2001 From: Colin Walters <walters(a)verbum.org> Date: Mon, 8 Aug 2016 20:39:12 -0400 Subject: Add pending patch to fix date-based pruning --- 0001-delta-Add-if-not-exists-option.patch | 178 +++++++++++++++++++++ ...n-the-tip-of-each-ref-even-with-date-prun.patch | 107 +++++++++++++ ostree.spec | 11 +- 3 files changed, 293 insertions(+), 3 deletions(-) create mode 100644 0001-delta-Add-if-not-exists-option.patch create mode 100644 0001-prune-Retain-the-tip-of-each-ref-even-with-date-prun.patch diff --git a/0001-delta-Add-if-not-exists-option.patch b/0001-delta-Add-if-not-exists-option.patch new file mode 100644 index 0000000..fc157ed --- /dev/null +++ b/0001-delta-Add-if-not-exists-option.patch @@ -0,0 +1,178 @@ +From 0d07c7ecdee251bb821ddebd4f8555bdcfd1d089 Mon Sep 17 00:00:00 2001 +From: Colin Walters <walters(a)verbum.org> +Date: Fri, 1 Jul 2016 14:39:49 -0400 +Subject: [PATCH] delta: Add --if-not-exists option + +I often want to have "idempotent" systems that iterate to a known +state. If after generating a commit, the system is interrupted, I'd +like the next run to still generate a delta. But we don't want to +regenerate if one exists, hence this option. + +Closes: #375 +Approved by: jlebon +--- + src/libostree/ostree-cmdprivate.c | 1 + + src/libostree/ostree-cmdprivate.h | 1 + + src/libostree/ostree-repo-static-delta-core.c | 33 ++++++++++++++++++++++++ + src/libostree/ostree-repo-static-delta-private.h | 7 +++++ + src/ostree/ot-builtin-static-delta.c | 16 ++++++++++++ + tests/test-delta.sh | 9 ++++++- + 6 files changed, 66 insertions(+), 1 deletion(-) + +diff --git a/src/libostree/ostree-cmdprivate.c b/src/libostree/ostree-cmdprivate.c +index 2c85bb4..4367b49 100644 +--- a/src/libostree/ostree-cmdprivate.c ++++ b/src/libostree/ostree-cmdprivate.c +@@ -47,6 +47,7 @@ ostree_cmd__private__ (void) + static OstreeCmdPrivateVTable table = { + impl_ostree_generate_grub2_config, + _ostree_repo_static_delta_dump, ++ _ostree_repo_static_delta_query_exists, + _ostree_repo_static_delta_delete + }; + +diff --git a/src/libostree/ostree-cmdprivate.h b/src/libostree/ostree-cmdprivate.h +index 9a74ead..8d1c653 100644 +--- a/src/libostree/ostree-cmdprivate.h ++++ b/src/libostree/ostree-cmdprivate.h +@@ -27,6 +27,7 @@ G_BEGIN_DECLS + typedef struct { + gboolean (* ostree_generate_grub2_config) (OstreeSysroot *sysroot, int bootversion, int target_fd, GCancellable *cancellable, GError **error); + gboolean (* ostree_static_delta_dump) (OstreeRepo *repo, const char *delta_id, GCancellable *cancellable, GError **error); ++ gboolean (* ostree_static_delta_query_exists) (OstreeRepo *repo, const char *delta_id, gboolean *out_exists, GCancellable *cancellable, GError **error); + gboolean (* ostree_static_delta_delete) (OstreeRepo *repo, const char *delta_id, GCancellable *cancellable, GError **error); + } OstreeCmdPrivateVTable; + +diff --git a/src/libostree/ostree-repo-static-delta-core.c b/src/libostree/ostree-repo-static-delta-core.c +index 6253a45..b730c40 100644 +--- a/src/libostree/ostree-repo-static-delta-core.c ++++ b/src/libostree/ostree-repo-static-delta-core.c +@@ -820,6 +820,39 @@ _ostree_repo_static_delta_delete (OstreeRepo *self, + } + + gboolean ++_ostree_repo_static_delta_query_exists (OstreeRepo *self, ++ const char *delta_id, ++ gboolean *out_exists, ++ GCancellable *cancellable, ++ GError **error) ++{ ++ gboolean ret = FALSE; ++ g_autofree char *from = NULL; ++ g_autofree char *to = NULL; ++ g_autofree char *superblock_path = NULL; ++ struct stat stbuf; ++ ++ _ostree_parse_delta_name (delta_id, &from, &to); ++ superblock_path = _ostree_get_relative_static_delta_superblock_path (from, to); ++ ++ if (fstatat (self->repo_dir_fd, superblock_path, &stbuf, 0) < 0) ++ { ++ if (errno == ENOENT) ++ { ++ *out_exists = FALSE; ++ return TRUE; ++ } ++ else ++ { ++ glnx_set_error_from_errno (error); ++ return FALSE; ++ } ++ } ++ *out_exists = TRUE; ++ return TRUE; ++} ++ ++gboolean + _ostree_repo_static_delta_dump (OstreeRepo *self, + const char *delta_id, + GCancellable *cancellable, +diff --git a/src/libostree/ostree-repo-static-delta-private.h b/src/libostree/ostree-repo-static-delta-private.h +index eeb99c3..31e8971 100644 +--- a/src/libostree/ostree-repo-static-delta-private.h ++++ b/src/libostree/ostree-repo-static-delta-private.h +@@ -191,6 +191,13 @@ _ostree_delta_compute_similar_objects (OstreeRepo *repo, + GError **error); + + gboolean ++_ostree_repo_static_delta_query_exists (OstreeRepo *repo, ++ const char *delta_id, ++ gboolean *out_exists, ++ GCancellable *cancellable, ++ GError **error); ++ ++gboolean + _ostree_repo_static_delta_dump (OstreeRepo *repo, + const char *delta_id, + GCancellable *cancellable, +diff --git a/src/ostree/ot-builtin-static-delta.c b/src/ostree/ot-builtin-static-delta.c +index 09eb90a..90702c5 100644 +--- a/src/ostree/ot-builtin-static-delta.c ++++ b/src/ostree/ot-builtin-static-delta.c +@@ -37,6 +37,7 @@ static gboolean opt_empty; + static gboolean opt_swap_endianness; + static gboolean opt_inline; + static gboolean opt_disable_bsdiff; ++static gboolean opt_if_not_exists; + + #define BUILTINPROTO(name) static gboolean ot_static_delta_builtin_ ## name (int argc, char **argv, GCancellable *cancellable, GError **error) + +@@ -64,6 +65,7 @@ static GOptionEntry generate_options[] = { + { "inline", 0, 0, G_OPTION_ARG_NONE, &opt_inline, "Inline delta parts into main delta", NULL }, + { "to", 0, 0, G_OPTION_ARG_STRING, &opt_to_rev, "Create delta to revision REV", "REV" }, + { "disable-bsdiff", 0, 0, G_OPTION_ARG_NONE, &opt_disable_bsdiff, "Disable use of bsdiff", NULL }, ++ { "if-not-exists", 'n', 0, G_OPTION_ARG_NONE, &opt_if_not_exists, "Only generate if a delta does not already exist", NULL }, + { "set-endianness", 0, 0, G_OPTION_ARG_STRING, &opt_endianness, "Choose metadata endianness ('l' or 'B')", "ENDIAN" }, + { "swap-endianness", 0, 0, G_OPTION_ARG_NONE, &opt_swap_endianness, "Swap metadata endianness from host order", NULL }, + { "min-fallback-size", 0, 0, G_OPTION_ARG_STRING, &opt_min_fallback_size, "Minimum uncompressed size in megabytes for individual HTTP request", NULL}, +@@ -264,6 +266,20 @@ ot_static_delta_builtin_generate (int argc, char **argv, GCancellable *cancellab + } + if (!ostree_repo_resolve_rev (repo, opt_to_rev, FALSE, &to_resolved, error)) + goto out; ++ ++ if (opt_if_not_exists) ++ { ++ gboolean does_exist; ++ g_autofree char *delta_id = from_resolved ? g_strconcat (from_resolved, "-", to_resolved, NULL) : g_strdup (to_resolved); ++ if (!ostree_cmd__private__ ()->ostree_static_delta_query_exists (repo, delta_id, &does_exist, cancellable, error)) ++ goto out; ++ if (does_exist) ++ { ++ g_print ("Delta %s already exists.\n", delta_id); ++ ret = TRUE; ++ goto out; ++ } ++ } + + if (opt_endianness) + { +diff --git a/tests/test-delta.sh b/tests/test-delta.sh +index 4b2b879..bd735c4 100755 +--- a/tests/test-delta.sh ++++ b/tests/test-delta.sh +@@ -82,6 +82,8 @@ get_assert_one_direntry_matching() { + origrev=$(${CMD_PREFIX} ostree --repo=repo rev-parse test) + + ${CMD_PREFIX} ostree --repo=repo static-delta generate --empty --to=${origrev} ++${CMD_PREFIX} ostree --repo=repo static-delta generate --if-not-exists --empty --to=${origrev} > out.txt ++assert_file_has_content out.txt "${origrev} already exists" + ${CMD_PREFIX} ostree --repo=repo static-delta list | grep ${origrev} || exit 1 + ${CMD_PREFIX} ostree --repo=repo prune + ${CMD_PREFIX} ostree --repo=repo static-delta list | grep ${origrev} || exit 1 +@@ -91,7 +93,12 @@ ${CMD_PREFIX} ostree --repo=repo commit -b test -s test --tree=dir=files + + newrev=$(${CMD_PREFIX} ostree --repo=repo rev-parse test) + +-${CMD_PREFIX} ostree --repo=repo static-delta generate --from=${origrev} --to=${newrev} --inline ++${CMD_PREFIX} ostree --repo=repo static-delta generate --if-not-exists --from=${origrev} --to=${newrev} --inline ++${CMD_PREFIX} ostree --repo=repo static-delta generate --if-not-exists --from=${origrev} --to=${newrev} --inline > out.txt ++assert_file_has_content out.txt "${origrev}-${newrev} already exists" ++# Should regenerate ++${CMD_PREFIX} ostree --repo=repo static-delta generate --from=${origrev} --to=${newrev} --inline > out.txt ++assert_not_file_has_content out.txt "${origrev}-${newrev} already exists" + + deltaprefix=$(get_assert_one_direntry_matching repo/deltas '.') + deltadir=$(get_assert_one_direntry_matching repo/deltas/${deltaprefix} '-') +-- +2.7.4 + diff --git a/0001-prune-Retain-the-tip-of-each-ref-even-with-date-prun.patch b/0001-prune-Retain-the-tip-of-each-ref-even-with-date-prun.patch new file mode 100644 index 0000000..5199f26 --- /dev/null +++ b/0001-prune-Retain-the-tip-of-each-ref-even-with-date-prun.patch @@ -0,0 +1,107 @@ +From 1ec166ee597641ef612b281b85f61a78b318b89b Mon Sep 17 00:00:00 2001 +From: Colin Walters <walters(a)verbum.org> +Date: Mon, 8 Aug 2016 15:41:09 -0400 +Subject: [PATCH] prune: Retain the tip of each ref even with date pruning + +I hit an error with [CAHC](https://wiki.centos.org/SpecialInterestGroup/Atomic/Devel) +where we were doing time-based pruning. `ostree summary -u` started failing, +and it took me a bit to realize it was because we were pruning +even the tip of old branches, which I was not at all expecting, +and I don't think users will too. + +Perhaps in the future we could add some sort of --prune-ref-tips or +something if people wanted it, but I doubt it. +--- + src/ostree/ot-builtin-prune.c | 20 ++++++++++++++++++++ + tests/test-prune.sh | 16 +++++++++++----- + 2 files changed, 31 insertions(+), 5 deletions(-) + +diff --git a/src/ostree/ot-builtin-prune.c b/src/ostree/ot-builtin-prune.c +index 0b843c9..b17e83b 100644 +--- a/src/ostree/ot-builtin-prune.c ++++ b/src/ostree/ot-builtin-prune.c +@@ -84,6 +84,8 @@ delete_commit (OstreeRepo *repo, const char *commit_to_delete, GCancellable *can + static gboolean + prune_commits_keep_younger_than_date (OstreeRepo *repo, const char *date, GCancellable *cancellable, GError **error) + { ++ g_autoptr(GHashTable) refs = NULL; ++ g_autoptr(GHashTable) ref_heads = g_hash_table_new (g_str_hash, g_str_equal); + g_autoptr(GHashTable) objects = NULL; + GHashTableIter hash_iter; + gpointer key, value; +@@ -100,6 +102,21 @@ prune_commits_keep_younger_than_date (OstreeRepo *repo, const char *date, GCance + if (!ot_enable_tombstone_commits (repo, error)) + goto out; + ++ if (!ostree_repo_list_refs (repo, NULL, &refs, cancellable, error)) ++ goto out; ++ ++ /* We used to prune the HEAD of a given ref by default, but that's ++ * broken for for a few reasons. One is that people may use branches as ++ * tags. Second is that if we do it, we should be deleting the ref ++ * too, otherwise e.g. `summary -u` breaks trying to load it, etc. ++ */ ++ g_hash_table_iter_init (&hash_iter, refs); ++ while (g_hash_table_iter_next (&hash_iter, &key, &value)) ++ { ++ /* Value is lifecycle bound to refs */ ++ g_hash_table_add (ref_heads, (char*)value); ++ } ++ + if (!ostree_repo_list_objects (repo, OSTREE_REPO_LIST_OBJECTS_ALL, &objects, + cancellable, error)) + goto out; +@@ -119,6 +136,9 @@ prune_commits_keep_younger_than_date (OstreeRepo *repo, const char *date, GCance + if (objtype != OSTREE_OBJECT_TYPE_COMMIT) + continue; + ++ if (g_hash_table_contains (ref_heads, checksum)) ++ continue; ++ + if (!ostree_repo_load_variant (repo, OSTREE_OBJECT_TYPE_COMMIT, checksum, + &commit, error)) + goto out; +diff --git a/tests/test-prune.sh b/tests/test-prune.sh +index d32edbc..5134d56 100755 +--- a/tests/test-prune.sh ++++ b/tests/test-prune.sh +@@ -87,25 +87,31 @@ assert_file_has_content tombstonecommitcount "^1$" + ${CMD_PREFIX} ostree prune --repo=repo --refs-only --depth=0 -v + find repo/objects -name '*.commit' | wc -l > commitcount + assert_file_has_content commitcount "^1$" +-${CMD_PREFIX} ostree --repo=repo commit --branch=test -m test -s test tree --timestamp="2010-10-29 12:43:29 +0000" + ${CMD_PREFIX} ostree --repo=repo commit --branch=test -m test -s test tree --timestamp="2005-10-29 12:43:29 +0000" ++${CMD_PREFIX} ostree --repo=repo commit --branch=test -m test -s test tree --timestamp="2010-10-29 12:43:29 +0000" + find repo/objects -name '*.commit' | wc -l > commitcount + assert_file_has_content commitcount "^3$" + ${CMD_PREFIX} ostree --repo=repo prune --keep-younger-than="2015-10-29 12:43:29 +0000" + find repo/objects -name '*.commit' | wc -l > commitcount +-assert_file_has_content commitcount "^1$" ++assert_file_has_content commitcount "^2$" + + + ${CMD_PREFIX} ostree prune --repo=repo --refs-only --depth=0 -v + find repo/objects -name '*.commit' | wc -l > commitcount +-assert_file_has_content commitcount "^1$" ++assert_file_has_content commitcount "^2$" + ${CMD_PREFIX} ostree --repo=repo commit --branch=test -m test -s test tree --timestamp="October 25 1985" + ${CMD_PREFIX} ostree --repo=repo commit --branch=test -m test -s test tree --timestamp="October 21 2015" + find repo/objects -name '*.commit' | wc -l > commitcount +-assert_file_has_content commitcount "^3$" ++assert_file_has_content commitcount "^4$" + ${CMD_PREFIX} ostree --repo=repo prune --keep-younger-than="1 week ago" + find repo/objects -name '*.commit' | wc -l > commitcount +-assert_file_has_content commitcount "^1$" ++assert_file_has_content commitcount "^2$" ++ ++${CMD_PREFIX} ostree --repo=repo commit --branch=oldcommit tree --timestamp="2005-10-29 12:43:29 +0000" ++oldcommit_rev=$($OSTREE --repo=repo rev-parse oldcommit) ++$OSTREE ls ${oldcommit_rev} ++${CMD_PREFIX} ostree --repo=repo prune --keep-younger-than="1 week ago" ++$OSTREE ls ${oldcommit_rev} + + ${CMD_PREFIX} ostree --repo=repo pull --depth=-1 origin test + ${CMD_PREFIX} ostree --repo=repo commit --branch=test -m test -s test tree --timestamp="November 05 1955" +-- +2.7.4 + diff --git a/ostree.spec b/ostree.spec index 6fce8ff..9e18782 100644 --- a/ostree.spec +++ b/ostree.spec @@ -1,13 +1,17 @@ Summary: Tool for managing bootable, immutable filesystem trees Name: ostree Version: 2016.7 -Release: 1%{?dist} +Release: 4%{?dist} #VCS: git:git://git.gnome.org/ostree Source0: https://github.com/ostreedev/%{name}/releases/download/v%{version}/%{name}-… Source1: 91-ostree.preset License: LGPLv2+ URL: http://live.gnome.org/OSTree +Patch0: 0001-delta-Add-if-not-exists-option.patch +Patch2: 0001-ostree-remount-Explicitly-set-tmp-to-01777.patch +Patch3: 0001-prune-Retain-the-tip-of-each-ref-even-with-date-prun.patch + BuildRequires: git # We always run autogen.sh BuildRequires: autoconf automake libtool @@ -36,8 +40,6 @@ Requires: dracut Requires: /usr/bin/gpgv2 Requires: systemd-units -Patch2: 0001-ostree-remount-Explicitly-set-tmp-to-01777.patch - %description OSTree is a tool for managing bootable, immutable, versioned filesystem trees. While it takes over some of the roles of tradtional @@ -127,6 +129,9 @@ install -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system-pres %endif %changelog +* Tue Aug 09 2016 Colin Walters <walters(a)verbum.org> - 2016.7-4 +- Add pending patch to fix date-based pruning + * Fri Jul 08 2016 walters(a)redhat.com - 2016.7-1 - New upstream version -- cgit v0.12 From 40751de96a2e461867ab5d98221cfa4422d6dd06 Mon Sep 17 00:00:00 2001 From: Colin Walters <walters(a)verbum.org> Date: Mon, 8 Aug 2016 20:53:54 -0400 Subject: Add pending patch to fix date-based pruning --- 0001-delta-Add-if-not-exists-option.patch | 178 ------------------------------ ostree.spec | 1 - 2 files changed, 179 deletions(-) delete mode 100644 0001-delta-Add-if-not-exists-option.patch diff --git a/0001-delta-Add-if-not-exists-option.patch b/0001-delta-Add-if-not-exists-option.patch deleted file mode 100644 index fc157ed..0000000 --- a/0001-delta-Add-if-not-exists-option.patch +++ /dev/null @@ -1,178 +0,0 @@ -From 0d07c7ecdee251bb821ddebd4f8555bdcfd1d089 Mon Sep 17 00:00:00 2001 -From: Colin Walters <walters(a)verbum.org> -Date: Fri, 1 Jul 2016 14:39:49 -0400 -Subject: [PATCH] delta: Add --if-not-exists option - -I often want to have "idempotent" systems that iterate to a known -state. If after generating a commit, the system is interrupted, I'd -like the next run to still generate a delta. But we don't want to -regenerate if one exists, hence this option. - -Closes: #375 -Approved by: jlebon ---- - src/libostree/ostree-cmdprivate.c | 1 + - src/libostree/ostree-cmdprivate.h | 1 + - src/libostree/ostree-repo-static-delta-core.c | 33 ++++++++++++++++++++++++ - src/libostree/ostree-repo-static-delta-private.h | 7 +++++ - src/ostree/ot-builtin-static-delta.c | 16 ++++++++++++ - tests/test-delta.sh | 9 ++++++- - 6 files changed, 66 insertions(+), 1 deletion(-) - -diff --git a/src/libostree/ostree-cmdprivate.c b/src/libostree/ostree-cmdprivate.c -index 2c85bb4..4367b49 100644 ---- a/src/libostree/ostree-cmdprivate.c -+++ b/src/libostree/ostree-cmdprivate.c -@@ -47,6 +47,7 @@ ostree_cmd__private__ (void) - static OstreeCmdPrivateVTable table = { - impl_ostree_generate_grub2_config, - _ostree_repo_static_delta_dump, -+ _ostree_repo_static_delta_query_exists, - _ostree_repo_static_delta_delete - }; - -diff --git a/src/libostree/ostree-cmdprivate.h b/src/libostree/ostree-cmdprivate.h -index 9a74ead..8d1c653 100644 ---- a/src/libostree/ostree-cmdprivate.h -+++ b/src/libostree/ostree-cmdprivate.h -@@ -27,6 +27,7 @@ G_BEGIN_DECLS - typedef struct { - gboolean (* ostree_generate_grub2_config) (OstreeSysroot *sysroot, int bootversion, int target_fd, GCancellable *cancellable, GError **error); - gboolean (* ostree_static_delta_dump) (OstreeRepo *repo, const char *delta_id, GCancellable *cancellable, GError **error); -+ gboolean (* ostree_static_delta_query_exists) (OstreeRepo *repo, const char *delta_id, gboolean *out_exists, GCancellable *cancellable, GError **error); - gboolean (* ostree_static_delta_delete) (OstreeRepo *repo, const char *delta_id, GCancellable *cancellable, GError **error); - } OstreeCmdPrivateVTable; - -diff --git a/src/libostree/ostree-repo-static-delta-core.c b/src/libostree/ostree-repo-static-delta-core.c -index 6253a45..b730c40 100644 ---- a/src/libostree/ostree-repo-static-delta-core.c -+++ b/src/libostree/ostree-repo-static-delta-core.c -@@ -820,6 +820,39 @@ _ostree_repo_static_delta_delete (OstreeRepo *self, - } - - gboolean -+_ostree_repo_static_delta_query_exists (OstreeRepo *self, -+ const char *delta_id, -+ gboolean *out_exists, -+ GCancellable *cancellable, -+ GError **error) -+{ -+ gboolean ret = FALSE; -+ g_autofree char *from = NULL; -+ g_autofree char *to = NULL; -+ g_autofree char *superblock_path = NULL; -+ struct stat stbuf; -+ -+ _ostree_parse_delta_name (delta_id, &from, &to); -+ superblock_path = _ostree_get_relative_static_delta_superblock_path (from, to); -+ -+ if (fstatat (self->repo_dir_fd, superblock_path, &stbuf, 0) < 0) -+ { -+ if (errno == ENOENT) -+ { -+ *out_exists = FALSE; -+ return TRUE; -+ } -+ else -+ { -+ glnx_set_error_from_errno (error); -+ return FALSE; -+ } -+ } -+ *out_exists = TRUE; -+ return TRUE; -+} -+ -+gboolean - _ostree_repo_static_delta_dump (OstreeRepo *self, - const char *delta_id, - GCancellable *cancellable, -diff --git a/src/libostree/ostree-repo-static-delta-private.h b/src/libostree/ostree-repo-static-delta-private.h -index eeb99c3..31e8971 100644 ---- a/src/libostree/ostree-repo-static-delta-private.h -+++ b/src/libostree/ostree-repo-static-delta-private.h -@@ -191,6 +191,13 @@ _ostree_delta_compute_similar_objects (OstreeRepo *repo, - GError **error); - - gboolean -+_ostree_repo_static_delta_query_exists (OstreeRepo *repo, -+ const char *delta_id, -+ gboolean *out_exists, -+ GCancellable *cancellable, -+ GError **error); -+ -+gboolean - _ostree_repo_static_delta_dump (OstreeRepo *repo, - const char *delta_id, - GCancellable *cancellable, -diff --git a/src/ostree/ot-builtin-static-delta.c b/src/ostree/ot-builtin-static-delta.c -index 09eb90a..90702c5 100644 ---- a/src/ostree/ot-builtin-static-delta.c -+++ b/src/ostree/ot-builtin-static-delta.c -@@ -37,6 +37,7 @@ static gboolean opt_empty; - static gboolean opt_swap_endianness; - static gboolean opt_inline; - static gboolean opt_disable_bsdiff; -+static gboolean opt_if_not_exists; - - #define BUILTINPROTO(name) static gboolean ot_static_delta_builtin_ ## name (int argc, char **argv, GCancellable *cancellable, GError **error) - -@@ -64,6 +65,7 @@ static GOptionEntry generate_options[] = { - { "inline", 0, 0, G_OPTION_ARG_NONE, &opt_inline, "Inline delta parts into main delta", NULL }, - { "to", 0, 0, G_OPTION_ARG_STRING, &opt_to_rev, "Create delta to revision REV", "REV" }, - { "disable-bsdiff", 0, 0, G_OPTION_ARG_NONE, &opt_disable_bsdiff, "Disable use of bsdiff", NULL }, -+ { "if-not-exists", 'n', 0, G_OPTION_ARG_NONE, &opt_if_not_exists, "Only generate if a delta does not already exist", NULL }, - { "set-endianness", 0, 0, G_OPTION_ARG_STRING, &opt_endianness, "Choose metadata endianness ('l' or 'B')", "ENDIAN" }, - { "swap-endianness", 0, 0, G_OPTION_ARG_NONE, &opt_swap_endianness, "Swap metadata endianness from host order", NULL }, - { "min-fallback-size", 0, 0, G_OPTION_ARG_STRING, &opt_min_fallback_size, "Minimum uncompressed size in megabytes for individual HTTP request", NULL}, -@@ -264,6 +266,20 @@ ot_static_delta_builtin_generate (int argc, char **argv, GCancellable *cancellab - } - if (!ostree_repo_resolve_rev (repo, opt_to_rev, FALSE, &to_resolved, error)) - goto out; -+ -+ if (opt_if_not_exists) -+ { -+ gboolean does_exist; -+ g_autofree char *delta_id = from_resolved ? g_strconcat (from_resolved, "-", to_resolved, NULL) : g_strdup (to_resolved); -+ if (!ostree_cmd__private__ ()->ostree_static_delta_query_exists (repo, delta_id, &does_exist, cancellable, error)) -+ goto out; -+ if (does_exist) -+ { -+ g_print ("Delta %s already exists.\n", delta_id); -+ ret = TRUE; -+ goto out; -+ } -+ } - - if (opt_endianness) - { -diff --git a/tests/test-delta.sh b/tests/test-delta.sh -index 4b2b879..bd735c4 100755 ---- a/tests/test-delta.sh -+++ b/tests/test-delta.sh -@@ -82,6 +82,8 @@ get_assert_one_direntry_matching() { - origrev=$(${CMD_PREFIX} ostree --repo=repo rev-parse test) - - ${CMD_PREFIX} ostree --repo=repo static-delta generate --empty --to=${origrev} -+${CMD_PREFIX} ostree --repo=repo static-delta generate --if-not-exists --empty --to=${origrev} > out.txt -+assert_file_has_content out.txt "${origrev} already exists" - ${CMD_PREFIX} ostree --repo=repo static-delta list | grep ${origrev} || exit 1 - ${CMD_PREFIX} ostree --repo=repo prune - ${CMD_PREFIX} ostree --repo=repo static-delta list | grep ${origrev} || exit 1 -@@ -91,7 +93,12 @@ ${CMD_PREFIX} ostree --repo=repo commit -b test -s test --tree=dir=files - - newrev=$(${CMD_PREFIX} ostree --repo=repo rev-parse test) - --${CMD_PREFIX} ostree --repo=repo static-delta generate --from=${origrev} --to=${newrev} --inline -+${CMD_PREFIX} ostree --repo=repo static-delta generate --if-not-exists --from=${origrev} --to=${newrev} --inline -+${CMD_PREFIX} ostree --repo=repo static-delta generate --if-not-exists --from=${origrev} --to=${newrev} --inline > out.txt -+assert_file_has_content out.txt "${origrev}-${newrev} already exists" -+# Should regenerate -+${CMD_PREFIX} ostree --repo=repo static-delta generate --from=${origrev} --to=${newrev} --inline > out.txt -+assert_not_file_has_content out.txt "${origrev}-${newrev} already exists" - - deltaprefix=$(get_assert_one_direntry_matching repo/deltas '.') - deltadir=$(get_assert_one_direntry_matching repo/deltas/${deltaprefix} '-') --- -2.7.4 - diff --git a/ostree.spec b/ostree.spec index 9e18782..d269183 100644 --- a/ostree.spec +++ b/ostree.spec @@ -8,7 +8,6 @@ Source1: 91-ostree.preset License: LGPLv2+ URL: http://live.gnome.org/OSTree -Patch0: 0001-delta-Add-if-not-exists-option.patch Patch2: 0001-ostree-remount-Explicitly-set-tmp-to-01777.patch Patch3: 0001-prune-Retain-the-tip-of-each-ref-even-with-date-prun.patch -- cgit v0.12 From e5d3a2866131ed5671ee15034c31b3702ce9e953 Mon Sep 17 00:00:00 2001 From: Colin Walters <walters(a)verbum.org> Date: Tue, 9 Aug 2016 16:02:00 -0400 Subject: New upstream version --- .gitignore | 1 + ostree.spec | 8 +++++--- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6d371ee..cb0dfa3 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ /ostree-2016.5.tar.xz /ostree-2016.6.tar.xz /ostree-2016.7.tar.xz +/ostree-2016.8.tar.xz diff --git a/ostree.spec b/ostree.spec index d269183..655d7ba 100644 --- a/ostree.spec +++ b/ostree.spec @@ -1,7 +1,7 @@ Summary: Tool for managing bootable, immutable filesystem trees Name: ostree -Version: 2016.7 -Release: 4%{?dist} +Version: 2016.8 +Release: 1%{?dist} #VCS: git:git://git.gnome.org/ostree Source0: https://github.com/ostreedev/%{name}/releases/download/v%{version}/%{name}-… Source1: 91-ostree.preset @@ -9,7 +9,6 @@ License: LGPLv2+ URL: http://live.gnome.org/OSTree Patch2: 0001-ostree-remount-Explicitly-set-tmp-to-01777.patch -Patch3: 0001-prune-Retain-the-tip-of-each-ref-even-with-date-prun.patch BuildRequires: git # We always run autogen.sh @@ -128,6 +127,9 @@ install -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system-pres %endif %changelog +* Tue Aug 09 2016 walters(a)redhat.com - 2016.8-1 +- New upstream version + * Tue Aug 09 2016 Colin Walters <walters(a)verbum.org> - 2016.7-4 - Add pending patch to fix date-based pruning diff --git a/sources b/sources index 7dd4dcb..30a0dd7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -08f4530d7ce13931fc17bd123f78ad2c ostree-2016.7.tar.xz +65786a0e60f96ca5c7f221632a9df375 ostree-2016.8.tar.xz -- cgit v0.12 From 1aa1345593223e7645d7327107369fde5167a889 Mon Sep 17 00:00:00 2001 From: Colin Walters <walters(a)verbum.org> Date: Thu, 11 Aug 2016 13:18:02 -0400 Subject: files: Adapt to prepare-root move --- ostree.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ostree.spec b/ostree.spec index 655d7ba..6557bc6 100644 --- a/ostree.spec +++ b/ostree.spec @@ -97,8 +97,6 @@ install -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system-pres %doc README.md %{_bindir}/ostree %{_bindir}/rofiles-fuse -%{_sbindir}/ostree-prepare-root -%{_sbindir}/ostree-remount %{_datadir}/ostree/trusted.gpg.d %{_sysconfdir}/ostree %{_sysconfdir}/dracut.conf.d/ostree.conf @@ -111,6 +109,9 @@ install -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system-pres %{_prefix}/lib/systemd/system-preset/91-ostree.preset %exclude %{_sysconfdir}/grub.d/*ostree %exclude %{_libexecdir}/ostree/grub2* +# Moved in git master +%{_prefix}/lib/ostree/ostree-prepare-root +%{_prefix}/lib/ostree/ostree-remount %files devel %{_libdir}/lib*.so -- cgit v0.12 From de4f46ba1d7c462ec654ec2de4528ddac6d099fa Mon Sep 17 00:00:00 2001 From: Colin Walters <walters(a)verbum.org> Date: Wed, 31 Aug 2016 15:11:44 -0400 Subject: New upstream version --- .gitignore | 1 + ...n-the-tip-of-each-ref-even-with-date-prun.patch | 107 --------------------- ostree.spec | 5 +- sources | 2 +- 4 files changed, 6 insertions(+), 109 deletions(-) delete mode 100644 0001-prune-Retain-the-tip-of-each-ref-even-with-date-prun.patch diff --git a/.gitignore b/.gitignore index cb0dfa3..dcaba76 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ /ostree-2016.6.tar.xz /ostree-2016.7.tar.xz /ostree-2016.8.tar.xz +/ostree-2016.9.tar.xz diff --git a/0001-prune-Retain-the-tip-of-each-ref-even-with-date-prun.patch b/0001-prune-Retain-the-tip-of-each-ref-even-with-date-prun.patch deleted file mode 100644 index 5199f26..0000000 --- a/0001-prune-Retain-the-tip-of-each-ref-even-with-date-prun.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 1ec166ee597641ef612b281b85f61a78b318b89b Mon Sep 17 00:00:00 2001 -From: Colin Walters <walters(a)verbum.org> -Date: Mon, 8 Aug 2016 15:41:09 -0400 -Subject: [PATCH] prune: Retain the tip of each ref even with date pruning - -I hit an error with [CAHC](https://wiki.centos.org/SpecialInterestGroup/Atomic/Devel) -where we were doing time-based pruning. `ostree summary -u` started failing, -and it took me a bit to realize it was because we were pruning -even the tip of old branches, which I was not at all expecting, -and I don't think users will too. - -Perhaps in the future we could add some sort of --prune-ref-tips or -something if people wanted it, but I doubt it. ---- - src/ostree/ot-builtin-prune.c | 20 ++++++++++++++++++++ - tests/test-prune.sh | 16 +++++++++++----- - 2 files changed, 31 insertions(+), 5 deletions(-) - -diff --git a/src/ostree/ot-builtin-prune.c b/src/ostree/ot-builtin-prune.c -index 0b843c9..b17e83b 100644 ---- a/src/ostree/ot-builtin-prune.c -+++ b/src/ostree/ot-builtin-prune.c -@@ -84,6 +84,8 @@ delete_commit (OstreeRepo *repo, const char *commit_to_delete, GCancellable *can - static gboolean - prune_commits_keep_younger_than_date (OstreeRepo *repo, const char *date, GCancellable *cancellable, GError **error) - { -+ g_autoptr(GHashTable) refs = NULL; -+ g_autoptr(GHashTable) ref_heads = g_hash_table_new (g_str_hash, g_str_equal); - g_autoptr(GHashTable) objects = NULL; - GHashTableIter hash_iter; - gpointer key, value; -@@ -100,6 +102,21 @@ prune_commits_keep_younger_than_date (OstreeRepo *repo, const char *date, GCance - if (!ot_enable_tombstone_commits (repo, error)) - goto out; - -+ if (!ostree_repo_list_refs (repo, NULL, &refs, cancellable, error)) -+ goto out; -+ -+ /* We used to prune the HEAD of a given ref by default, but that's -+ * broken for for a few reasons. One is that people may use branches as -+ * tags. Second is that if we do it, we should be deleting the ref -+ * too, otherwise e.g. `summary -u` breaks trying to load it, etc. -+ */ -+ g_hash_table_iter_init (&hash_iter, refs); -+ while (g_hash_table_iter_next (&hash_iter, &key, &value)) -+ { -+ /* Value is lifecycle bound to refs */ -+ g_hash_table_add (ref_heads, (char*)value); -+ } -+ - if (!ostree_repo_list_objects (repo, OSTREE_REPO_LIST_OBJECTS_ALL, &objects, - cancellable, error)) - goto out; -@@ -119,6 +136,9 @@ prune_commits_keep_younger_than_date (OstreeRepo *repo, const char *date, GCance - if (objtype != OSTREE_OBJECT_TYPE_COMMIT) - continue; - -+ if (g_hash_table_contains (ref_heads, checksum)) -+ continue; -+ - if (!ostree_repo_load_variant (repo, OSTREE_OBJECT_TYPE_COMMIT, checksum, - &commit, error)) - goto out; -diff --git a/tests/test-prune.sh b/tests/test-prune.sh -index d32edbc..5134d56 100755 ---- a/tests/test-prune.sh -+++ b/tests/test-prune.sh -@@ -87,25 +87,31 @@ assert_file_has_content tombstonecommitcount "^1$" - ${CMD_PREFIX} ostree prune --repo=repo --refs-only --depth=0 -v - find repo/objects -name '*.commit' | wc -l > commitcount - assert_file_has_content commitcount "^1$" --${CMD_PREFIX} ostree --repo=repo commit --branch=test -m test -s test tree --timestamp="2010-10-29 12:43:29 +0000" - ${CMD_PREFIX} ostree --repo=repo commit --branch=test -m test -s test tree --timestamp="2005-10-29 12:43:29 +0000" -+${CMD_PREFIX} ostree --repo=repo commit --branch=test -m test -s test tree --timestamp="2010-10-29 12:43:29 +0000" - find repo/objects -name '*.commit' | wc -l > commitcount - assert_file_has_content commitcount "^3$" - ${CMD_PREFIX} ostree --repo=repo prune --keep-younger-than="2015-10-29 12:43:29 +0000" - find repo/objects -name '*.commit' | wc -l > commitcount --assert_file_has_content commitcount "^1$" -+assert_file_has_content commitcount "^2$" - - - ${CMD_PREFIX} ostree prune --repo=repo --refs-only --depth=0 -v - find repo/objects -name '*.commit' | wc -l > commitcount --assert_file_has_content commitcount "^1$" -+assert_file_has_content commitcount "^2$" - ${CMD_PREFIX} ostree --repo=repo commit --branch=test -m test -s test tree --timestamp="October 25 1985" - ${CMD_PREFIX} ostree --repo=repo commit --branch=test -m test -s test tree --timestamp="October 21 2015" - find repo/objects -name '*.commit' | wc -l > commitcount --assert_file_has_content commitcount "^3$" -+assert_file_has_content commitcount "^4$" - ${CMD_PREFIX} ostree --repo=repo prune --keep-younger-than="1 week ago" - find repo/objects -name '*.commit' | wc -l > commitcount --assert_file_has_content commitcount "^1$" -+assert_file_has_content commitcount "^2$" -+ -+${CMD_PREFIX} ostree --repo=repo commit --branch=oldcommit tree --timestamp="2005-10-29 12:43:29 +0000" -+oldcommit_rev=$($OSTREE --repo=repo rev-parse oldcommit) -+$OSTREE ls ${oldcommit_rev} -+${CMD_PREFIX} ostree --repo=repo prune --keep-younger-than="1 week ago" -+$OSTREE ls ${oldcommit_rev} - - ${CMD_PREFIX} ostree --repo=repo pull --depth=-1 origin test - ${CMD_PREFIX} ostree --repo=repo commit --branch=test -m test -s test tree --timestamp="November 05 1955" --- -2.7.4 - diff --git a/ostree.spec b/ostree.spec index 6557bc6..c20bce2 100644 --- a/ostree.spec +++ b/ostree.spec @@ -1,6 +1,6 @@ Summary: Tool for managing bootable, immutable filesystem trees Name: ostree -Version: 2016.8 +Version: 2016.9 Release: 1%{?dist} #VCS: git:git://git.gnome.org/ostree Source0: https://github.com/ostreedev/%{name}/releases/download/v%{version}/%{name}-… @@ -128,6 +128,9 @@ install -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system-pres %endif %changelog +* Wed Aug 31 2016 Colin Walters <walters(a)verbum.org> - 2016.9-1 +- New upstream version + * Tue Aug 09 2016 walters(a)redhat.com - 2016.8-1 - New upstream version diff --git a/sources b/sources index 30a0dd7..0e6e86c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -65786a0e60f96ca5c7f221632a9df375 ostree-2016.8.tar.xz +d5b56cf8f47c7adc4bee861d23a48824 ostree-2016.9.tar.xz -- cgit v0.12 http://pkgs.fedoraproject.org/cgit/ostree.git/commit/?h=f25&id=0e2374daa0d7…

1 0

walters pushed to ostree (f25). "New upstream version"
by notifications＠fedoraproject.org 31 Aug '16

31 Aug '16

From de4f46ba1d7c462ec654ec2de4528ddac6d099fa Mon Sep 17 00:00:00 2001 From: Colin Walters <walters(a)verbum.org> Date: Wed, 31 Aug 2016 15:11:44 -0400 Subject: New upstream version --- .gitignore | 1 + ...n-the-tip-of-each-ref-even-with-date-prun.patch | 107 --------------------- ostree.spec | 5 +- sources | 2 +- 4 files changed, 6 insertions(+), 109 deletions(-) delete mode 100644 0001-prune-Retain-the-tip-of-each-ref-even-with-date-prun.patch diff --git a/.gitignore b/.gitignore index cb0dfa3..dcaba76 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ /ostree-2016.6.tar.xz /ostree-2016.7.tar.xz /ostree-2016.8.tar.xz +/ostree-2016.9.tar.xz diff --git a/0001-prune-Retain-the-tip-of-each-ref-even-with-date-prun.patch b/0001-prune-Retain-the-tip-of-each-ref-even-with-date-prun.patch deleted file mode 100644 index 5199f26..0000000 --- a/0001-prune-Retain-the-tip-of-each-ref-even-with-date-prun.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 1ec166ee597641ef612b281b85f61a78b318b89b Mon Sep 17 00:00:00 2001 -From: Colin Walters <walters(a)verbum.org> -Date: Mon, 8 Aug 2016 15:41:09 -0400 -Subject: [PATCH] prune: Retain the tip of each ref even with date pruning - -I hit an error with [CAHC](https://wiki.centos.org/SpecialInterestGroup/Atomic/Devel) -where we were doing time-based pruning. `ostree summary -u` started failing, -and it took me a bit to realize it was because we were pruning -even the tip of old branches, which I was not at all expecting, -and I don't think users will too. - -Perhaps in the future we could add some sort of --prune-ref-tips or -something if people wanted it, but I doubt it. ---- - src/ostree/ot-builtin-prune.c | 20 ++++++++++++++++++++ - tests/test-prune.sh | 16 +++++++++++----- - 2 files changed, 31 insertions(+), 5 deletions(-) - -diff --git a/src/ostree/ot-builtin-prune.c b/src/ostree/ot-builtin-prune.c -index 0b843c9..b17e83b 100644 ---- a/src/ostree/ot-builtin-prune.c -+++ b/src/ostree/ot-builtin-prune.c -@@ -84,6 +84,8 @@ delete_commit (OstreeRepo *repo, const char *commit_to_delete, GCancellable *can - static gboolean - prune_commits_keep_younger_than_date (OstreeRepo *repo, const char *date, GCancellable *cancellable, GError **error) - { -+ g_autoptr(GHashTable) refs = NULL; -+ g_autoptr(GHashTable) ref_heads = g_hash_table_new (g_str_hash, g_str_equal); - g_autoptr(GHashTable) objects = NULL; - GHashTableIter hash_iter; - gpointer key, value; -@@ -100,6 +102,21 @@ prune_commits_keep_younger_than_date (OstreeRepo *repo, const char *date, GCance - if (!ot_enable_tombstone_commits (repo, error)) - goto out; - -+ if (!ostree_repo_list_refs (repo, NULL, &refs, cancellable, error)) -+ goto out; -+ -+ /* We used to prune the HEAD of a given ref by default, but that's -+ * broken for for a few reasons. One is that people may use branches as -+ * tags. Second is that if we do it, we should be deleting the ref -+ * too, otherwise e.g. `summary -u` breaks trying to load it, etc. -+ */ -+ g_hash_table_iter_init (&hash_iter, refs); -+ while (g_hash_table_iter_next (&hash_iter, &key, &value)) -+ { -+ /* Value is lifecycle bound to refs */ -+ g_hash_table_add (ref_heads, (char*)value); -+ } -+ - if (!ostree_repo_list_objects (repo, OSTREE_REPO_LIST_OBJECTS_ALL, &objects, - cancellable, error)) - goto out; -@@ -119,6 +136,9 @@ prune_commits_keep_younger_than_date (OstreeRepo *repo, const char *date, GCance - if (objtype != OSTREE_OBJECT_TYPE_COMMIT) - continue; - -+ if (g_hash_table_contains (ref_heads, checksum)) -+ continue; -+ - if (!ostree_repo_load_variant (repo, OSTREE_OBJECT_TYPE_COMMIT, checksum, - &commit, error)) - goto out; -diff --git a/tests/test-prune.sh b/tests/test-prune.sh -index d32edbc..5134d56 100755 ---- a/tests/test-prune.sh -+++ b/tests/test-prune.sh -@@ -87,25 +87,31 @@ assert_file_has_content tombstonecommitcount "^1$" - ${CMD_PREFIX} ostree prune --repo=repo --refs-only --depth=0 -v - find repo/objects -name '*.commit' | wc -l > commitcount - assert_file_has_content commitcount "^1$" --${CMD_PREFIX} ostree --repo=repo commit --branch=test -m test -s test tree --timestamp="2010-10-29 12:43:29 +0000" - ${CMD_PREFIX} ostree --repo=repo commit --branch=test -m test -s test tree --timestamp="2005-10-29 12:43:29 +0000" -+${CMD_PREFIX} ostree --repo=repo commit --branch=test -m test -s test tree --timestamp="2010-10-29 12:43:29 +0000" - find repo/objects -name '*.commit' | wc -l > commitcount - assert_file_has_content commitcount "^3$" - ${CMD_PREFIX} ostree --repo=repo prune --keep-younger-than="2015-10-29 12:43:29 +0000" - find repo/objects -name '*.commit' | wc -l > commitcount --assert_file_has_content commitcount "^1$" -+assert_file_has_content commitcount "^2$" - - - ${CMD_PREFIX} ostree prune --repo=repo --refs-only --depth=0 -v - find repo/objects -name '*.commit' | wc -l > commitcount --assert_file_has_content commitcount "^1$" -+assert_file_has_content commitcount "^2$" - ${CMD_PREFIX} ostree --repo=repo commit --branch=test -m test -s test tree --timestamp="October 25 1985" - ${CMD_PREFIX} ostree --repo=repo commit --branch=test -m test -s test tree --timestamp="October 21 2015" - find repo/objects -name '*.commit' | wc -l > commitcount --assert_file_has_content commitcount "^3$" -+assert_file_has_content commitcount "^4$" - ${CMD_PREFIX} ostree --repo=repo prune --keep-younger-than="1 week ago" - find repo/objects -name '*.commit' | wc -l > commitcount --assert_file_has_content commitcount "^1$" -+assert_file_has_content commitcount "^2$" -+ -+${CMD_PREFIX} ostree --repo=repo commit --branch=oldcommit tree --timestamp="2005-10-29 12:43:29 +0000" -+oldcommit_rev=$($OSTREE --repo=repo rev-parse oldcommit) -+$OSTREE ls ${oldcommit_rev} -+${CMD_PREFIX} ostree --repo=repo prune --keep-younger-than="1 week ago" -+$OSTREE ls ${oldcommit_rev} - - ${CMD_PREFIX} ostree --repo=repo pull --depth=-1 origin test - ${CMD_PREFIX} ostree --repo=repo commit --branch=test -m test -s test tree --timestamp="November 05 1955" --- -2.7.4 - diff --git a/ostree.spec b/ostree.spec index 6557bc6..c20bce2 100644 --- a/ostree.spec +++ b/ostree.spec @@ -1,6 +1,6 @@ Summary: Tool for managing bootable, immutable filesystem trees Name: ostree -Version: 2016.8 +Version: 2016.9 Release: 1%{?dist} #VCS: git:git://git.gnome.org/ostree Source0: https://github.com/ostreedev/%{name}/releases/download/v%{version}/%{name}-… @@ -128,6 +128,9 @@ install -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system-pres %endif %changelog +* Wed Aug 31 2016 Colin Walters <walters(a)verbum.org> - 2016.9-1 +- New upstream version + * Tue Aug 09 2016 walters(a)redhat.com - 2016.8-1 - New upstream version diff --git a/sources b/sources index 30a0dd7..0e6e86c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -65786a0e60f96ca5c7f221632a9df375 ostree-2016.8.tar.xz +d5b56cf8f47c7adc4bee861d23a48824 ostree-2016.9.tar.xz -- cgit v0.12 http://pkgs.fedoraproject.org/cgit/ostree.git/commit/?h=f25&id=de4f46ba1d7c…

1 0

walters pushed to ostree (f25). "files: Adapt to prepare-root move"
by notifications＠fedoraproject.org 31 Aug '16

31 Aug '16

1 0

walters pushed to ostree (f25). "New upstream version"
by notifications＠fedoraproject.org 31 Aug '16

31 Aug '16

1 0

walters pushed to ostree (f25). "Add pending patch to fix date-based pruning"
by notifications＠fedoraproject.org 31 Aug '16

31 Aug '16

1 0

walters pushed to ostree (f25). "Add pending patch to fix date-based pruning"
by notifications＠fedoraproject.org 31 Aug '16

31 Aug '16

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
1680
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

scm-commits August 2016