git.iko.soy/typeable/nixpkgs
on master help sign in
ostree: 2019.1 -> 2019.2

All patches synced. fix-1592.patch needed some new additions since that issue affects more test cases. https://github.com/ostreedev/ostree/releases/tag/v2019.2 Co-authored-by: Jan Tojnar <jtojnar@gmail.com>

commitdca61d854fa74d463d7845c9b8de9fdf70370ba5 authorworldofpeace <worldofpeace@protonmail.ch> dateTue 30 Jul 2019, 18:47 (7 years ago) parent46d0ebb
4 files changed+344−35
pkgs/tools/misc/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch+271 pkgs/tools/misc/ostree/default.nix+3−6 pkgs/tools/misc/ostree/disable-test-gpg-verify-result.patch+6−6 pkgs/tools/misc/ostree/fix-1592.patch+64−23
pkgs/tools/misc/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patchnew file+271
@@ -0,0 +1,271 @@
1+From a9a62d7c7adf6fc0237c7d04937b538a4cea87ad Mon Sep 17 00:00:00 2001
2+From: Colin Walters <walters@verbum.org>
3+Date: Tue, 19 Jun 2018 09:34:18 -0400
4+Subject: [PATCH] Drop "ostree trivial-httpd" CLI, move to tests directory
5+
6+See https://github.com/ostreedev/ostree/issues/1593
7+
8+Basically this makes it easier for people packaging, as the trivial-httpd
9+is only for tests, and this way the binary will live with the tests.
10+
11+Also at this point nothing should depend on `ostree trivial-httpd`.
12+---
13+ Makefile-man.am | 6 --
14+ Makefile-ostree.am | 7 ---
15+ Makefile-tests.am | 7 +++
16+ configure.ac | 10 ---
17+ man/ostree-trivial-httpd.xml | 118 -----------------------------------
18+ src/ostree/main.c | 5 --
19+ tests/libtest.sh | 13 ++--
20+ 7 files changed, 12 insertions(+), 154 deletions(-)
21+ delete mode 100644 man/ostree-trivial-httpd.xml
22+
23+diff --git a/Makefile-man.am b/Makefile-man.am
24+index 8ccbba8c..d204aa3e 100644
25+--- a/Makefile-man.am
26++++ b/Makefile-man.am
27+@@ -34,12 +34,6 @@ ostree-init.1 ostree-log.1 ostree-ls.1 ostree-prune.1 ostree-pull-local.1 \
28+ ostree-pull.1 ostree-refs.1 ostree-remote.1 ostree-reset.1 \
29+ ostree-rev-parse.1 ostree-show.1 ostree-summary.1 \
30+ ostree-static-delta.1
31+-if BUILDOPT_TRIVIAL_HTTPD
32+-man1_files += ostree-trivial-httpd.1
33+-else
34+-# We still want to distribute the source, even if we are not building it
35+-EXTRA_DIST += man/ostree-trivial-httpd.xml
36+-endif
37+
38+ if BUILDOPT_FUSE
39+ man1_files += rofiles-fuse.1
40+diff --git a/Makefile-ostree.am b/Makefile-ostree.am
41+index 8d352e38..1471b3e5 100644
42+--- a/Makefile-ostree.am
43++++ b/Makefile-ostree.am
44+@@ -133,13 +133,6 @@ ostree_SOURCES += src/ostree/ot-builtin-pull.c
45+ endif
46+
47+ if USE_LIBSOUP
48+-# Eventually once we stop things from using this, we should support disabling this
49+-ostree_SOURCES += src/ostree/ot-builtin-trivial-httpd.c
50+-pkglibexec_PROGRAMS += ostree-trivial-httpd
51+-ostree_trivial_httpd_SOURCES = src/ostree/ostree-trivial-httpd.c
52+-ostree_trivial_httpd_CFLAGS = $(ostree_bin_shared_cflags) $(OT_INTERNAL_SOUP_CFLAGS)
53+-ostree_trivial_httpd_LDADD = $(ostree_bin_shared_ldadd) $(OT_INTERNAL_SOUP_LIBS)
54+-
55+ if !USE_CURL
56+ # This is necessary for the cookie jar bits
57+ ostree_CFLAGS += $(OT_INTERNAL_SOUP_CFLAGS)
58+diff --git a/Makefile-tests.am b/Makefile-tests.am
59+index 2c0916f6..b11fde89 100644
60+--- a/Makefile-tests.am
61++++ b/Makefile-tests.am
62+@@ -248,6 +248,13 @@ _installed_or_uninstalled_test_programs = tests/test-varint tests/test-ot-unix-u
63+ tests/test-gpg-verify-result tests/test-checksum tests/test-lzma tests/test-rollsum \
64+ tests/test-basic-c tests/test-sysroot-c tests/test-pull-c tests/test-repo tests/test-include-ostree-h
65+
66++if USE_LIBSOUP
67++test_extra_programs += ostree-trivial-httpd
68++ostree_trivial_httpd_SOURCES = src/ostree/ostree-trivial-httpd.c
69++ostree_trivial_httpd_CFLAGS = $(common_tests_cflags) $(OT_INTERNAL_SOUP_CFLAGS)
70++ostree_trivial_httpd_LDADD = $(common_tests_ldadd) $(OT_INTERNAL_SOUP_LIBS)
71++endif
72++
73+ if USE_AVAHI
74+ test_programs += tests/test-repo-finder-avahi
75+ endif
76+diff --git a/configure.ac b/configure.ac
77+index e6e145db..1e36e6a0 100644
78+--- a/configure.ac
79++++ b/configure.ac
80+@@ -187,15 +187,6 @@ if test x$with_soup != xno; then OSTREE_FEATURES="$OSTREE_FEATURES libsoup"; fi
81+ AM_CONDITIONAL(USE_LIBSOUP, test x$with_soup != xno)
82+ AM_CONDITIONAL(HAVE_LIBSOUP_CLIENT_CERTS, test x$have_libsoup_client_certs = xyes)
83+
84+-AC_ARG_ENABLE(trivial-httpd-cmdline,
85+- [AS_HELP_STRING([--enable-trivial-httpd-cmdline],
86+- [Continue to support "ostree trivial-httpd" [default=no]])],,
87+- enable_trivial_httpd_cmdline=no)
88+-AM_CONDITIONAL(BUILDOPT_TRIVIAL_HTTPD, test x$enable_trivial_httpd_cmdline = xyes)
89+-AM_COND_IF(BUILDOPT_TRIVIAL_HTTPD,
90+- [AC_DEFINE([BUILDOPT_ENABLE_TRIVIAL_HTTPD_CMDLINE], 1, [Define if we are enabling ostree trivial-httpd entrypoint])]
91+-)
92+-
93+ AS_IF([test x$with_curl = xyes && test x$with_soup = xno], [
94+ AC_MSG_WARN([Curl enabled, but libsoup is not; libsoup is needed for tests (make check, etc.)])
95+ ])
96+@@ -602,7 +593,6 @@ echo "
97+ Rust (internal oxidation): $rust_debug_release
98+ rofiles-fuse: $enable_rofiles_fuse
99+ HTTP backend: $fetcher_backend
100+- \"ostree trivial-httpd\": $enable_trivial_httpd_cmdline
101+ SELinux: $with_selinux
102+ cryptographic checksums: $with_crypto
103+ systemd: $have_libsystemd
104+diff --git a/man/ostree-trivial-httpd.xml b/man/ostree-trivial-httpd.xml
105+deleted file mode 100644
106+index d03c12be..00000000
107+--- a/man/ostree-trivial-httpd.xml
108++++ /dev/null
109+@@ -1,118 +0,0 @@
110+-<?xml version='1.0'?> <!--*-nxml-*-->
111+-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
112+- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
113+-
114+-<!--
115+-Copyright 2011,2013 Colin Walters <walters@verbum.org>
116+-
117+-SPDX-License-Identifier: LGPL-2.0+
118+-
119+-This library is free software; you can redistribute it and/or
120+-modify it under the terms of the GNU Lesser General Public
121+-License as published by the Free Software Foundation; either
122+-version 2 of the License, or (at your option) any later version.
123+-
124+-This library is distributed in the hope that it will be useful,
125+-but WITHOUT ANY WARRANTY; without even the implied warranty of
126+-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
127+-Lesser General Public License for more details.
128+-
129+-You should have received a copy of the GNU Lesser General Public
130+-License along with this library; if not, write to the
131+-Free Software Foundation, Inc., 59 Temple Place - Suite 330,
132+-Boston, MA 02111-1307, USA.
133+--->
134+-
135+-<refentry id="ostree">
136+-
137+- <refentryinfo>
138+- <title>ostree trivial-httpd</title>
139+- <productname>OSTree</productname>
140+-
141+- <authorgroup>
142+- <author>
143+- <contrib>Developer</contrib>
144+- <firstname>Colin</firstname>
145+- <surname>Walters</surname>
146+- <email>walters@verbum.org</email>
147+- </author>
148+- </authorgroup>
149+- </refentryinfo>
150+-
151+- <refmeta>
152+- <refentrytitle>ostree trivial-httpd</refentrytitle>
153+- <manvolnum>1</manvolnum>
154+- </refmeta>
155+-
156+- <refnamediv>
157+- <refname>ostree-trivial-httpd</refname>
158+- <refpurpose>Simple webserver</refpurpose>
159+- </refnamediv>
160+-
161+- <refsynopsisdiv>
162+- <cmdsynopsis>
163+- <command>ostree trivial-httpd</command> <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="opt">DIR</arg>
164+- </cmdsynopsis>
165+- </refsynopsisdiv>
166+-
167+-<!-- Don't entirely understand this command. Needs details, better content-->
168+- <refsect1>
169+- <title>Description</title>
170+-
171+- <para>
172+- This runs a simple webserver and keeps it running until killed. If DIR is not specified, it defaults to the current directory.
173+- </para>
174+- </refsect1>
175+-
176+- <refsect1>
177+- <title>Options</title>
178+-
179+- <variablelist>
180+- <varlistentry>
181+- <term><option>--daemonize</option>,<option>-d</option></term>
182+-
183+- <listitem><para>
184+- Fork into background when ready.
185+- </para></listitem>
186+- </varlistentry>
187+-
188+- <varlistentry>
189+- <term><option>--autoexit</option></term>
190+-
191+- <listitem><para>
192+- Automatically exit when directory is deleted.
193+- </para></listitem>
194+- </varlistentry>
195+-
196+- <varlistentry>
197+- <term><option>--port-file</option>,<option>-p</option>="PATH"</term>
198+-
199+- <listitem><para>
200+- Write port number to PATH (- for standard output).
201+- </para></listitem>
202+- </varlistentry>
203+-
204+- <varlistentry>
205+- <term><option>--port</option>,<option>-P</option></term>
206+-
207+- <listitem><para>
208+- Use the specified TCP port to listen on.
209+- </para></listitem>
210+- </varlistentry>
211+-
212+- <varlistentry>
213+- <term><option>--force-range-requests</option></term>
214+-
215+- <listitem><para>
216+- Force range requests by only serving half of files.
217+- </para></listitem>
218+- </varlistentry>
219+- </variablelist>
220+- </refsect1>
221+-
222+-<!-- NEED EXAMPLE OUTPUT HERE!-->
223+- <refsect1>
224+- <title>Example</title>
225+- <para><command>$ ostree trivial-httpd</command></para>
226+- </refsect1>
227+-</refentry>
228+diff --git a/src/ostree/main.c b/src/ostree/main.c
229+index c5b45012..6478a62b 100644
230+--- a/src/ostree/main.c
231++++ b/src/ostree/main.c
232+@@ -116,11 +116,6 @@ static OstreeCommand commands[] = {
233+ { "summary", OSTREE_BUILTIN_FLAG_NONE,
234+ ostree_builtin_summary,
235+ "Manage summary metadata" },
236+-#if defined(HAVE_LIBSOUP) && defined(BUILDOPT_ENABLE_TRIVIAL_HTTPD_CMDLINE)
237+- { "trivial-httpd", OSTREE_BUILTIN_FLAG_NONE,
238+- ostree_builtin_trivial_httpd,
239+- NULL },
240+-#endif
241+ { NULL }
242+ };
243+
244+diff --git a/tests/libtest.sh b/tests/libtest.sh
245+index e0022512..b07dc962 100755
246+--- a/tests/libtest.sh
247++++ b/tests/libtest.sh
248+@@ -149,15 +149,12 @@ fi
249+ if test -n "${OSTREE_UNINSTALLED:-}"; then
250+ OSTREE_HTTPD=${OSTREE_UNINSTALLED}/ostree-trivial-httpd
251+ else
252+- # trivial-httpd is now in $libexecdir by default, which we don't
253+- # know at this point. Fortunately, libtest.sh is also in
254+- # $libexecdir, so make an educated guess. If it's not found, assume
255+- # it's still runnable as "ostree trivial-httpd".
256+- if [ -x "${test_srcdir}/../../libostree/ostree-trivial-httpd" ]; then
257+- OSTREE_HTTPD="${CMD_PREFIX} ${test_srcdir}/../../libostree/ostree-trivial-httpd"
258+- else
259+- OSTREE_HTTPD="${CMD_PREFIX} ostree trivial-httpd"
260++ # trivial-httpd is now the test directory.
261++ OSTREE_HTTPD="${G_TEST_BUILDDIR}/ostree-trivial-httpd"
262++ if ! [ -x "${OSTREE_HTTPD}" ]; then
263++ fatal "Failed to find ${OSTREE_HTTPD}"
264+ fi
265++ OSTREE_HTTPD="${CMD_PREFIX} ${OSTREE_HTTPD}"
266+ fi
267+
268+ files_are_hardlinked() {
269+--
270+2.22.0
271+
pkgs/tools/misc/ostree/default.nix+3−6
@@ -5,13 +5,13 @@
55
66stdenv.mkDerivation rec {
77 pname = "ostree";
8− version = "2019.1";
8+ version = "2019.2";
99
1010 outputs = [ "out" "dev" "man" "installedTests" ];
1111
1212 src = fetchurl {
1313 url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz";
14− sha256 = "08y7nsxl305dnlfak4kyj88lld848y4kg6bvjqngcxaqqvkk9xqm";
14+ sha256 = "0nbbrz3p4ms6vpl272q6fimqvizryw2a8mnfqcn69xf03sz5204y";
1515 };
1616
1717 patches = [
@@ -22,10 +22,7 @@ stdenv.mkDerivation rec {
2222 ./disable-test-gpg-verify-result.patch
2323 # Tests access the helper using relative path
2424 # https://github.com/ostreedev/ostree/issues/1593
25− (fetchpatch {
26− url = https://github.com/ostreedev/ostree/pull/1633.patch;
27− sha256 = "07xiw1dr7j4yw3w92qhw37f9crlglibflcqj2kf0v5gfrl9i6g4j";
28− })
25+ ./01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch
2926 ];
3027
3128 nativeBuildInputs = [
pkgs/tools/misc/ostree/disable-test-gpg-verify-result.patch+6−6
@@ -1,12 +1,12 @@
1−diff -aur --no-dereference a/Makefile-tests.am b/Makefile-tests.am
2−--- a/Makefile-tests.am 1970-01-01 01:00:01.000000000 +0100
3−+++ b/Makefile-tests.am 2018-09-17 00:24:11.977841113 +0200
4−@@ -243,7 +243,7 @@
1+diff --git a/Makefile-tests.am b/Makefile-tests.am
2+index b11fde89..82937a67 100644
3+--- a/Makefile-tests.am
4++++ b/Makefile-tests.am
5+@@ -245,7 +245,6 @@ endif
56
67 _installed_or_uninstalled_test_programs = tests/test-varint tests/test-ot-unix-utils tests/test-bsdiff tests/test-mutable-tree \
78 tests/test-keyfile-utils tests/test-ot-opt-utils tests/test-ot-tool-util \
89- tests/test-gpg-verify-result tests/test-checksum tests/test-lzma tests/test-rollsum \
9−+ tests/test-checksum tests/test-lzma tests/test-rollsum \
1010 tests/test-basic-c tests/test-sysroot-c tests/test-pull-c tests/test-repo tests/test-include-ostree-h
1111
12− if USE_AVAHI
12+ if USE_LIBSOUP
pkgs/tools/misc/ostree/fix-1592.patch+64−23
@@ -1,6 +1,7 @@
1−diff -aur --no-dereference a/tests/pull-test.sh b/tests/pull-test.sh
2−--- a/tests/pull-test.sh 1970-01-01 01:00:01.000000000 +0100
3−+++ b/tests/pull-test.sh 2018-09-16 23:55:44.214593856 +0200
1+diff --git a/tests/pull-test.sh b/tests/pull-test.sh
2+index a8bc49a9..4a08ebb5 100644
3+--- a/tests/pull-test.sh
4++++ b/tests/pull-test.sh
45@@ -275,7 +275,7 @@
56 if ${CMD_PREFIX} ostree --repo=mirrorrepo-local pull-local otherrepo 2>err.txt; then
67 fatal "pull with mixed refs succeeded?"
@@ -19,23 +20,62 @@ diff -aur --no-dereference a/tests/pull-test.sh b/tests/pull-test.sh
1920 echo "ok pull-local nonexistent branch"
2021
2122 cd ${test_tmpdir}
22−@@ -587,5 +587,5 @@
23+@@ -593,5 +593,5 @@
2324 if ${CMD_PREFIX} ostree --repo=repo pull origin main 2>err.txt; then
2425 fatal "pull of invalid ref succeeded"
2526 fi
2627-assert_file_has_content_literal err.txt 'error: Fetching checksum for ref ((empty), main): Invalid rev lots of html here lots of html here lots of html here lots of'
2728+assert_file_has_content_literal err.txt 'Fetching checksum for ref ((empty), main): Invalid rev lots of html here lots of html here lots of html here lots of'
2829 echo "ok pull got HTML for a ref"
29−diff -aur --no-dereference a/tests/test-fsck-collections.sh b/tests/test-fsck-collections.sh
30−--- a/tests/test-fsck-collections.sh 1970-01-01 01:00:01.000000000 +0100
31−+++ b/tests/test-fsck-collections.sh 2018-09-17 02:22:48.922502037 +0200
30+diff --git a/tests/test-config.sh b/tests/test-config.sh
31+index 7e913d32..69d1675d 100755
32+--- a/tests/test-config.sh
33++++ b/tests/test-config.sh
34+@@ -46,7 +46,7 @@
35+ if ${CMD_PREFIX} ostree config --repo=repo get --group=core lock-timeout-secs extra 2>err.txt; then
36+ assert_not_reached "ostree config get should error out if too many arguments are given"
37+ fi
38+-assert_file_has_content err.txt "error: Too many arguments given"
39++assert_file_has_content err.txt "Too many arguments given"
40+ echo "ok config get"
41+
42+ ${CMD_PREFIX} ostree config --repo=repo set core.mode bare-user-only
43+@@ -63,7 +63,7 @@
44+ if ${CMD_PREFIX} ostree config --repo=repo set --group=core lock-timeout-secs 120 extra 2>err.txt; then
45+ assert_not_reached "ostree config set should error out if too many arguments are given"
46+ fi
47+-assert_file_has_content err.txt "error: Too many arguments given"
48++assert_file_has_content err.txt "Too many arguments given"
49+ echo "ok config set"
50+
51+ # Check that "ostree config unset" works
52+@@ -78,7 +78,7 @@
53+ fi
54+ # Check for any character where quotation marks would be as they appear differently in the Fedora and Debian
55+ # test suites (“” and '' respectively). See: https://github.com/ostreedev/ostree/pull/1839
56+-assert_file_has_content err.txt "error: Key file does not have key .lock-timeout-secs. in group .core."
57++assert_file_has_content err.txt "Key file does not have key .lock-timeout-secs. in group .core."
58+
59+ # Check that it's idempotent
60+ ${CMD_PREFIX} ostree config --repo=repo unset core.lock-timeout-secs
61+@@ -95,5 +95,5 @@
62+ if ${CMD_PREFIX} ostree config --repo=repo unset core.lock-timeout-secs extra 2>err.txt; then
63+ assert_not_reached "ostree config unset should error out if too many arguments are given"
64+ fi
65+-assert_file_has_content err.txt "error: Too many arguments given"
66++assert_file_has_content err.txt "Too many arguments given"
67+ echo "ok config unset"
68+diff --git a/tests/test-fsck-collections.sh b/tests/test-fsck-collections.sh
69+index dc6bcfeb..4a5eef55 100755
70+--- a/tests/test-fsck-collections.sh
71++++ b/tests/test-fsck-collections.sh
3272@@ -100,7 +100,7 @@
3373 if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then
3474 assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
3575 fi
3676-assert_file_has_content fsck-error "Commit has no requested ref ‘new-ref’ in ref binding metadata (‘ref1’)"
3777+assert_file_has_content fsck-error "Commit has no requested ref .new-ref. in ref binding metadata (.ref1.)"
38− assert_file_has_content fsck "^Validating refs...$"
78+ assert_file_has_content fsck "^Validating refs\.\.\.$"
3979
4080 echo "ok 3 fsck detects missing ref bindings"
4181@@ -113,7 +113,7 @@
@@ -44,26 +84,26 @@ diff -aur --no-dereference a/tests/test-fsck-collections.sh b/tests/test-fsck-co
4484 fi
4585-assert_file_has_content fsck-error "Commit has no requested ref ‘new-ref’ in ref binding metadata (‘ref1’)"
4686+assert_file_has_content fsck-error "Commit has no requested ref .new-ref. in ref binding metadata (.ref1.)"
47− assert_file_has_content fsck "^Validating refs...$"
48− assert_file_has_content fsck "^Validating refs in collections...$"
87+ assert_file_has_content fsck "^Validating refs\.\.\.$"
88+ assert_file_has_content fsck "^Validating refs in collections\.\.\.$"
4989
5090@@ -127,7 +127,7 @@
5191 if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then
5292 assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
5393 fi
54−-assert_file_has_content fsck-error "Commit has collection ID ‘org.example.Collection’ in collection binding metadata, while the remote it came from has collection ID ‘org.example.Collection2’"
55−+assert_file_has_content fsck-error "Commit has collection ID .org.example.Collection. in collection binding metadata, while the remote it came from has collection ID .org.example.Collection2."
56− assert_file_has_content fsck "^Validating refs...$"
57− assert_file_has_content fsck "^Validating refs in collections...$"
94+-assert_file_has_content fsck-error "Commit has collection ID ‘org\.example\.Collection’ in collection binding metadata, while the remote it came from has collection ID ‘org\.example\.Collection2’"
95++assert_file_has_content fsck-error "Commit has collection ID .org\.example\.Collection. in collection binding metadata, while the remote it came from has collection ID .org\.example\.Collection2."
96+ assert_file_has_content fsck "^Validating refs\.\.\.$"
97+ assert_file_has_content fsck "^Validating refs in collections\.\.\.$"
5898
5999@@ -147,7 +147,7 @@
60100 if ${CMD_PREFIX} ostree fsck --repo=repo --verify-back-refs > fsck 2> fsck-error; then
61101 assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
62102 fi
63−-assert_file_has_content fsck-error "Collection–ref (org.example.Collection, ref1) in bindings for commit .* does not exist"
64−+assert_file_has_content fsck-error 'Collection.ref (org.example.Collection, ref1) in bindings for commit .* does not exist'
65− assert_file_has_content fsck "^Validating refs...$"
66− assert_file_has_content fsck "^Validating refs in collections...$"
103+-assert_file_has_content fsck-error "Collection–ref (org\.example\.Collection, ref1) in bindings for commit .* does not exist"
104++assert_file_has_content fsck-error 'Collection.ref (org\.example\.Collection, ref1) in bindings for commit .* does not exist'
105+ assert_file_has_content fsck "^Validating refs\.\.\.$"
106+ assert_file_has_content fsck "^Validating refs in collections\.\.\.$"
67107
68108@@ -186,7 +186,7 @@
69109 if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then
@@ -71,7 +111,7 @@ diff -aur --no-dereference a/tests/test-fsck-collections.sh b/tests/test-fsck-co
71111 fi
72112-assert_file_has_content fsck-error "Commit has no requested ref ‘new-ref’ in ref binding metadata (‘ref3’, ‘ref4’)"
73113+assert_file_has_content fsck-error "Commit has no requested ref .new-ref. in ref binding metadata (.ref3., .ref4.)"
74− assert_file_has_content fsck "^Validating refs...$"
114+ assert_file_has_content fsck "^Validating refs\.\.\.$"
75115
76116 echo "ok 9 fsck detects missing ref bindings"
77117@@ -205,7 +205,7 @@
@@ -80,12 +120,13 @@ diff -aur --no-dereference a/tests/test-fsck-collections.sh b/tests/test-fsck-co
80120 fi
81121-assert_file_has_content fsck-error "Ref ‘ref3’ in bindings for commit .* does not exist"
82122+assert_file_has_content fsck-error 'Ref .ref3. in bindings for commit .* does not exist'
83− assert_file_has_content fsck "^Validating refs...$"
123+ assert_file_has_content fsck "^Validating refs\.\.\.$"
84124
85125 echo "ok 11 fsck ignores unreferenced ref bindings"
86−diff -aur --no-dereference a/tests/test-remote-add.sh b/tests/test-remote-add.sh
87−--- a/tests/test-remote-add.sh 1970-01-01 01:00:01.000000000 +0100
88−+++ b/tests/test-remote-add.sh 2018-09-17 00:14:16.486788225 +0200
126+diff --git a/tests/test-remote-add.sh b/tests/test-remote-add.sh
127+index bb7eae89..62a3bcd7 100755
128+--- a/tests/test-remote-add.sh
129++++ b/tests/test-remote-add.sh
89130@@ -83,7 +83,7 @@
90131 if $OSTREE remote delete nosuchremote 2>err.txt; then
91132 assert_not_reached "Deleting remote unexpectedly succeeded"