packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Remove --disable-static-deltas option 

I'm confident now we can declare them stable.
This commit is contained in:
Colin Walters 2016-01-27 11:06:30 -05:00
parent 0c15c9d6dd
commit 8702ec7b3e
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure.ac
View File

@ -235,15 +235,6 @@ AS_IF([test "x$found_introspection" = xyes], [
], [have_gjs=no]) ], [have_gjs=no])
AM_CONDITIONAL(BUILDOPT_GJS, test x$have_gjs = xyes) AM_CONDITIONAL(BUILDOPT_GJS, test x$have_gjs = xyes)
AC_ARG_ENABLE(static_deltas,
AS_HELP_STRING([--enable-static-deltas],
[Enable static delta code (default: yes)]),,
[enable_static_deltas=yes])
AS_IF([test x$enable_static_deltas = xyes], [
AC_DEFINE([BUILDOPT_STATIC_DELTAS], 1, [Define if static deltas are enabled])
])
AM_CONDITIONAL(BUILDOPT_STATIC_DELTAS, test x$enable_static_deltas = xyes)
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile Makefile
apidoc/Makefile apidoc/Makefile
@ -261,7 +252,7 @@ echo "
libsoup TLS client certs: $have_libsoup_client_certs libsoup TLS client certs: $have_libsoup_client_certs
SELinux: $with_selinux SELinux: $with_selinux
libarchive (parse tar files directly): $with_libarchive libarchive (parse tar files directly): $with_libarchive
static deltas: $enable_static_deltas static deltas: yes (always enabled now)
man pages (xsltproc): $enable_man man pages (xsltproc): $enable_man
api docs (gtk-doc): $enable_gtk_doc api docs (gtk-doc): $enable_gtk_doc
gjs-based tests: $have_gjs gjs-based tests: $have_gjs

2
src/libostree/ostree-repo-pull.c
View File

@ -2208,14 +2208,12 @@ ostree_repo_pull_with_options (OstreeRepo *self,
&from_revision, error)) &from_revision, error))
goto out; goto out;
#ifdef BUILDOPT_STATIC_DELTAS
if (!disable_static_deltas && (from_revision == NULL || g_strcmp0 (from_revision, to_revision) != 0)) if (!disable_static_deltas && (from_revision == NULL || g_strcmp0 (from_revision, to_revision) != 0))
{ {
if (!request_static_delta_superblock_sync (pull_data, from_revision, to_revision, if (!request_static_delta_superblock_sync (pull_data, from_revision, to_revision,
&delta_superblock, cancellable, error)) &delta_superblock, cancellable, error))
goto out; goto out;
} }
#endif
if (!delta_superblock) if (!delta_superblock)
{ {