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

Merge tag 'upstream/2017.5' into debian/master 

Upstream version 2017.5
This commit is contained in:
Simon McVittie 2017-04-19 14:13:50 +01:00
parent d7a728cf0e 9a063f1a8b
commit 6ef9bdd60e
11 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for libostree 2017.4.
# Generated by GNU Autoconf 2.69 for libostree 2017.5.
#
# Report bugs to <walters@verbum.org>.
#
@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libostree'
PACKAGE_TARNAME='libostree'
PACKAGE_VERSION='2017.4'
PACKAGE_STRING='libostree 2017.4'
PACKAGE_VERSION='2017.5'
PACKAGE_STRING='libostree 2017.5'
PACKAGE_BUGREPORT='walters@verbum.org'
PACKAGE_URL=''
@ -1513,7 +1513,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures libostree 2017.4 to adapt to many kinds of systems.
\`configure' configures libostree 2017.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1583,7 +1583,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of libostree 2017.4:";;
short | recursive ) echo "Configuration of libostree 2017.5:";;
esac
cat <<\_ACEOF
@ -1809,7 +1809,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
libostree configure 2017.4
libostree configure 2017.5
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@ -2224,7 +2224,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by libostree $as_me 2017.4, which was
It was created by libostree $as_me 2017.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@ -3091,7 +3091,7 @@ fi
# Define the identity of the package.
PACKAGE='libostree'
VERSION='2017.4'
VERSION='2017.5'
# Some tools Automake needs.
@ -5825,9 +5825,9 @@ test -n "$YACC" || YACC="yacc"
YEAR_VERSION=2017
RELEASE_VERSION=4
RELEASE_VERSION=5
PACKAGE_VERSION=2017.4
PACKAGE_VERSION=2017.5
@ -17661,7 +17661,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by libostree $as_me 2017.4, which was
This file was extended by libostree $as_me 2017.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -17727,7 +17727,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
libostree config.status 2017.4
libostree config.status 2017.5
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"

2
configure.ac
View File

@ -1,7 +1,7 @@
AC_PREREQ([2.63])
dnl If incrementing the version here, remember to update libostree.sym too
m4_define([year_version], [2017])
m4_define([release_version], [4])
m4_define([release_version], [5])
m4_define([package_version], [year_version.release_version])
AC_INIT([libostree], [package_version], [walters@verbum.org])

2
man/ostree-admin-config-diff.1
View File

@ -2,7 +2,7 @@
.\" Title: ostree admin config-diff
.\" Author: Colin Walters <walters@verbum.org>
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
.\" Date: 04/05/2017
.\" Date: 04/14/2017
.\" Manual: ostree admin config-diff
.\" Source: OSTree
.\" Language: English

2
man/ostree-admin-deploy.1
View File

@ -2,7 +2,7 @@
.\" Title: ostree admin deploy
.\" Author: Colin Walters <walters@verbum.org>
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
.\" Date: 04/05/2017
.\" Date: 04/14/2017
.\" Manual: ostree admin deploy
.\" Source: OSTree
.\" Language: English

2
man/ostree-admin-os-init.1
View File

@ -2,7 +2,7 @@
.\" Title: ostree admin os-init
.\" Author: Colin Walters <walters@verbum.org>
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
.\" Date: 04/05/2017
.\" Date: 04/14/2017
.\" Manual: ostree admin os-init
.\" Source: OSTree
.\" Language: English

2
man/ostree-admin-switch.1
View File

@ -2,7 +2,7 @@
.\" Title: ostree admin switch
.\" Author: Colin Walters <walters@verbum.org>
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
.\" Date: 04/05/2017
.\" Date: 04/14/2017
.\" Manual: ostree admin switch
.\" Source: OSTree
.\" Language: English

2
man/ostree-admin-upgrade.1
View File

@ -2,7 +2,7 @@
.\" Title: ostree admin upgrade
.\" Author: Colin Walters <walters@verbum.org>
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
.\" Date: 04/05/2017
.\" Date: 04/14/2017
.\" Manual: ostree admin upgrade
.\" Source: OSTree
.\" Language: English

2
man/ostree.1
View File

@ -2,7 +2,7 @@
.\" Title: ostree
.\" Author: Colin Walters <walters@verbum.org>
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
.\" Date: 04/05/2017
.\" Date: 04/14/2017
.\" Manual: ostree
.\" Source: OSTree
.\" Language: English

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

@ -479,7 +479,6 @@ checkout_one_file_at (OstreeRepo *repo,
(current_repo->mode == OSTREE_REPO_MODE_BARE
&& options->mode == OSTREE_REPO_CHECKOUT_MODE_NONE) ||
(repo_is_usermode && options->mode == OSTREE_REPO_CHECKOUT_MODE_USER);
gboolean is_bare = is_hardlinkable && !is_bare_user_symlink;
gboolean current_can_cache = (options->enable_uncompressed_cache
&& current_repo->enable_uncompressed_cache);
gboolean is_archive_z2_with_cache = (current_repo->mode == OSTREE_REPO_MODE_ARCHIVE_Z2
@ -491,6 +490,7 @@ checkout_one_file_at (OstreeRepo *repo,
* as well as write_object().
*/
is_bare_user_symlink = (repo_is_usermode && is_symlink);
const gboolean is_bare = is_hardlinkable && !is_bare_user_symlink;
/* Verify if no_copy_fallback is set that we can hardlink, with a
* special exception for bare-user symlinks.

6
src/libostree/ostree-version.h
View File

@ -40,14 +40,14 @@
*
* ostree release version component (e.g. 2 if %OSTREE_VERSION is 2017.2)
*/
#define OSTREE_RELEASE_VERSION (4)
#define OSTREE_RELEASE_VERSION (5)
/**
* OSTREE_VERSION
*
* ostree version.
*/
#define OSTREE_VERSION (2017.4)
#define OSTREE_VERSION (2017.5)
/**
* OSTREE_VERSION_S:
@ -55,7 +55,7 @@
* ostree version, encoded as a string, useful for printing and
* concatenation.
*/
#define OSTREE_VERSION_S "2017.4"
#define OSTREE_VERSION_S "2017.5"
#define OSTREE_ENCODE_VERSION(year,release) \
((year) << 16 | (release))

1
tests/basic-test.sh
View File

@ -44,6 +44,7 @@ validate_checkout_basic() {
assert_has_file baz/cow
assert_file_has_content baz/cow moo
assert_has_file baz/deeper/ohyeah
assert_symlink_has_content somelink nosuchfile
)
}