diff --git a/Makefile-bash.am b/Makefile-bash.am index b42f6bfa..7e8389e9 100644 --- a/Makefile-bash.am +++ b/Makefile-bash.am @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . completionsdir = @BASH_COMPLETIONSDIR@ dist_completions_DATA = bash/ostree diff --git a/Makefile-boot.am b/Makefile-boot.am index 9a04bbdb..ec10a0d6 100644 --- a/Makefile-boot.am +++ b/Makefile-boot.am @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . if BUILDOPT_DRACUT # Not using $(libdir) here is intentional, dracut modules go in prefix/lib diff --git a/Makefile-decls.am b/Makefile-decls.am index 086ee138..0b4d22c6 100644 --- a/Makefile-decls.am +++ b/Makefile-decls.am @@ -13,9 +13,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . # Common variables AM_CPPFLAGS = diff --git a/Makefile-libostree-defines.am b/Makefile-libostree-defines.am index 4d290a88..b01ec2a1 100644 --- a/Makefile-libostree-defines.am +++ b/Makefile-libostree-defines.am @@ -16,14 +16,13 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . libostree_public_headers = \ src/libostree/ostree.h \ src/libostree/ostree-async-progress.h \ src/libostree/ostree-autocleanups.h \ + src/libostree/ostree-content-writer.h \ src/libostree/ostree-core.h \ src/libostree/ostree-dummy-enumtypes.h \ src/libostree/ostree-mutable-tree.h \ diff --git a/Makefile-libostree.am b/Makefile-libostree.am index 1f698afc..c9511fe3 100644 --- a/Makefile-libostree.am +++ b/Makefile-libostree.am @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . include Makefile-libostree-defines.am diff --git a/Makefile-man.am b/Makefile-man.am index 718e773c..78025fff 100644 --- a/Makefile-man.am +++ b/Makefile-man.am @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . if ENABLE_MAN diff --git a/Makefile-ostree.am b/Makefile-ostree.am index dde10c17..82af1681 100644 --- a/Makefile-ostree.am +++ b/Makefile-ostree.am @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . bin_PROGRAMS += ostree diff --git a/Makefile-otutil.am b/Makefile-otutil.am index 7bc87b6a..79a9d3da 100644 --- a/Makefile-otutil.am +++ b/Makefile-otutil.am @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . noinst_LTLIBRARIES += libotutil.la diff --git a/Makefile-switchroot.am b/Makefile-switchroot.am index ad370eb7..104ec0cd 100644 --- a/Makefile-switchroot.am +++ b/Makefile-switchroot.am @@ -13,9 +13,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . if BUILDOPT_SYSTEMD ostree_boot_PROGRAMS += ostree-remount diff --git a/Makefile-tests.am b/Makefile-tests.am index efbcad9a..6bae65cf 100644 --- a/Makefile-tests.am +++ b/Makefile-tests.am @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . EXTRA_DIST += \ buildutil/tap-driver.sh \ @@ -64,6 +62,7 @@ _installed_or_uninstalled_test_scripts = \ tests/test-basic-user.sh \ tests/test-basic-user-only.sh \ tests/test-basic-root.sh \ + tests/test-cli-extensions.sh \ tests/test-pull-subpath.sh \ tests/test-archivez.sh \ tests/test-remote-add.sh \ diff --git a/Makefile.am b/Makefile.am index 1dcf6b74..ce90ca45 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,9 +13,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . include Makefile-decls.am diff --git a/Makefile.in b/Makefile.in index d426c389..dc259a3f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -29,9 +29,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . # Copyright (C) 2011,2014 Colin Walters # @@ -48,9 +46,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . # GLIB - Library of useful C routines @@ -112,9 +108,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . # Makefile for C source code # @@ -133,9 +127,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . # Shared variables between toplevel Makefile.am and doc/Makefile.am # ...since gtk-doc forces use of recursive make =( @@ -155,9 +147,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . # Makefile for C source code # @@ -176,9 +166,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . # Copyright (C) 2011 Colin Walters # @@ -195,9 +183,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . # Copyright (C) 2016 Colin Walters # @@ -214,9 +200,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . # Makefile for tests code # @@ -235,9 +219,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . # Makefile for boot module # @@ -256,9 +238,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . # Makefile for man/ # @@ -277,9 +257,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . # Makefile for bash/ # @@ -298,9 +276,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . @@ -2049,13 +2025,13 @@ am__EXEEXT_21 = tests/test-core.js tests/test-remotes-config-dir.js \ @BUILDOPT_GJS_TRUE@am__EXEEXT_22 = $(js_tests) $(am__EXEEXT_21) am__EXEEXT_23 = tests/test-basic.sh tests/test-basic-user.sh \ tests/test-basic-user-only.sh tests/test-basic-root.sh \ - tests/test-pull-subpath.sh tests/test-archivez.sh \ - tests/test-remote-add.sh tests/test-remote-headers.sh \ - tests/test-commit-sign.sh tests/test-commit-timestamp.sh \ - tests/test-export.sh tests/test-help.sh \ - tests/test-libarchive.sh tests/test-parent.sh \ - tests/test-pull-bare.sh tests/test-pull-bareuser.sh \ - tests/test-pull-bareuseronly.sh \ + tests/test-cli-extensions.sh tests/test-pull-subpath.sh \ + tests/test-archivez.sh tests/test-remote-add.sh \ + tests/test-remote-headers.sh tests/test-commit-sign.sh \ + tests/test-commit-timestamp.sh tests/test-export.sh \ + tests/test-help.sh tests/test-libarchive.sh \ + tests/test-parent.sh tests/test-pull-bare.sh \ + tests/test-pull-bareuser.sh tests/test-pull-bareuseronly.sh \ tests/test-pull2-bareuseronly.sh \ tests/test-pull-commit-only.sh tests/test-pull-depth.sh \ tests/test-pull-mirror-summary.sh \ @@ -2224,6 +2200,10 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FUSE3_CFLAGS = @FUSE3_CFLAGS@ +FUSE3_LIBS = @FUSE3_LIBS@ +FUSE_CFLAGS = @FUSE_CFLAGS@ +FUSE_LIBS = @FUSE_LIBS@ GJS = @GJS@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ @@ -2627,6 +2607,7 @@ libostree_public_headers = \ src/libostree/ostree.h \ src/libostree/ostree-async-progress.h \ src/libostree/ostree-autocleanups.h \ + src/libostree/ostree-content-writer.h \ src/libostree/ostree-core.h \ src/libostree/ostree-dummy-enumtypes.h \ src/libostree/ostree-mutable-tree.h \ @@ -2909,13 +2890,14 @@ test_programs = tests/test-bloom tests/test-repo-finder-config \ $(am__append_81) _installed_or_uninstalled_test_scripts = tests/test-basic.sh \ tests/test-basic-user.sh tests/test-basic-user-only.sh \ - tests/test-basic-root.sh tests/test-pull-subpath.sh \ - tests/test-archivez.sh tests/test-remote-add.sh \ - tests/test-remote-headers.sh tests/test-commit-sign.sh \ - tests/test-commit-timestamp.sh tests/test-export.sh \ - tests/test-help.sh tests/test-libarchive.sh \ - tests/test-parent.sh tests/test-pull-bare.sh \ - tests/test-pull-bareuser.sh tests/test-pull-bareuseronly.sh \ + tests/test-basic-root.sh tests/test-cli-extensions.sh \ + tests/test-pull-subpath.sh tests/test-archivez.sh \ + tests/test-remote-add.sh tests/test-remote-headers.sh \ + tests/test-commit-sign.sh tests/test-commit-timestamp.sh \ + tests/test-export.sh tests/test-help.sh \ + tests/test-libarchive.sh tests/test-parent.sh \ + tests/test-pull-bare.sh tests/test-pull-bareuser.sh \ + tests/test-pull-bareuseronly.sh \ tests/test-pull2-bareuseronly.sh \ tests/test-pull-commit-only.sh tests/test-pull-depth.sh \ tests/test-pull-mirror-summary.sh \ @@ -8244,6 +8226,13 @@ tests/test-basic-root.sh.log: tests/test-basic-root.sh --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) +tests/test-cli-extensions.sh.log: tests/test-cli-extensions.sh + @p='tests/test-cli-extensions.sh'; \ + b='tests/test-cli-extensions.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) tests/test-pull-subpath.sh.log: tests/test-pull-subpath.sh @p='tests/test-pull-subpath.sh'; \ b='tests/test-pull-subpath.sh'; \ diff --git a/apidoc/Makefile.am b/apidoc/Makefile.am index f1f8faed..7b824d5a 100644 --- a/apidoc/Makefile.am +++ b/apidoc/Makefile.am @@ -13,9 +13,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . abs_top_builddir = @abs_top_builddir@ diff --git a/apidoc/Makefile.in b/apidoc/Makefile.in index f67c7cc0..5b0c5c22 100644 --- a/apidoc/Makefile.in +++ b/apidoc/Makefile.in @@ -29,9 +29,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . # Shared variables between toplevel Makefile.am and doc/Makefile.am # ...since gtk-doc forces use of recursive make =( @@ -51,9 +49,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . # -*- mode: makefile -*- # @@ -222,6 +218,10 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FUSE3_CFLAGS = @FUSE3_CFLAGS@ +FUSE3_LIBS = @FUSE3_LIBS@ +FUSE_CFLAGS = @FUSE_CFLAGS@ +FUSE_LIBS = @FUSE_LIBS@ GJS = @GJS@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ @@ -392,6 +392,7 @@ libostree_public_headers = \ src/libostree/ostree.h \ src/libostree/ostree-async-progress.h \ src/libostree/ostree-autocleanups.h \ + src/libostree/ostree-content-writer.h \ src/libostree/ostree-core.h \ src/libostree/ostree-dummy-enumtypes.h \ src/libostree/ostree-mutable-tree.h \ diff --git a/apidoc/html/index.html b/apidoc/html/index.html index 1ad0c2e3..bb0fbcaf 100644 --- a/apidoc/html/index.html +++ b/apidoc/html/index.html @@ -14,7 +14,7 @@
-

for OSTree 2021.6

+

for OSTree 2022.1

diff --git a/apidoc/html/ostree-OstreeRepo.html b/apidoc/html/ostree-OstreeRepo.html index 86d0c516..8f5c983f 100644 --- a/apidoc/html/ostree-OstreeRepo.html +++ b/apidoc/html/ostree-OstreeRepo.html @@ -9541,7 +9541,7 @@ have associated collection IDs will be included in the generated summary file, listed under the OSTREE_SUMMARY_COLLECTION_MAP key. Collection IDs and refs in OSTREE_SUMMARY_COLLECTION_MAP are guaranteed to be in lexicographic order.

-

Locking: exclusive

+

Locking: shared (Prior to 2021.7, this was exclusive)

Parameters

diff --git a/apidoc/version.xml b/apidoc/version.xml index f34332ce..51d37475 100644 --- a/apidoc/version.xml +++ b/apidoc/version.xml @@ -1 +1 @@ -2021.6 \ No newline at end of file +2022.1 \ No newline at end of file diff --git a/bsdiff/README.md b/bsdiff/README.md index a4b1d232..2e9ff707 100644 --- a/bsdiff/README.md +++ b/bsdiff/README.md @@ -4,11 +4,11 @@ bsdiff and bspatch are libraries for building and applying patches to binary files. The original algorithm and implementation was developed by Colin Percival. The -algorithm is detailed in his (unpublished) paper, [Naïve Differences of Executable Code](http://www.daemonology.net/papers/bsdiff.pdf). For more information, visit his +algorithm is detailed in his paper, [Naïve Differences of Executable Code](http://www.daemonology.net/papers/bsdiff.pdf). For more information, visit his website at . -I maintain this project seperately from Colin's work, with the goal of making -the core functionality easily embedable in existing projects. +I maintain this project separately from Colin's work, with the goal of making +the core functionality easily embeddable in existing projects. Contact ------- @@ -37,7 +37,7 @@ I've exposed relevant functions via the `_stream` classes. The only external dependency not exposed is `memcmp` in `bsdiff`. This library generates patches that are not compatible with the original bsdiff -tool. The impompatibilities were motivated by the patching needs for the game +tool. The incompatibilities were motivated by the patching needs for the game AirMech and the following requirements: * Eliminate/minimize any seek operations when applying patches @@ -82,7 +82,7 @@ Reference In order to use `bsdiff`, you need to define functions for allocating memory and -writing binary data. This behavior is controlled by the `stream` parameted +writing binary data. This behavior is controlled by the `stream` parameter passed to to `bsdiff(...)`. The `opaque` field is never read or modified from within the `bsdiff` function. diff --git a/bsdiff/bspatch.c b/bsdiff/bspatch.c index 881d7e3c..ba54c728 100644 --- a/bsdiff/bspatch.c +++ b/bsdiff/bspatch.c @@ -1,4 +1,4 @@ -/*- +/*- * Copyright 2003-2005 Colin Percival * Copyright 2012 Matthew Endsley * All rights reserved @@ -25,6 +25,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include #include "bspatch.h" static int64_t offtin(uint8_t *buf) @@ -62,7 +63,9 @@ int bspatch(const uint8_t* old, int64_t oldsize, uint8_t* new, int64_t newsize, }; /* Sanity-check */ - if(newpos+ctrl[0]>newsize) + if (ctrl[0]<0 || ctrl[0]>INT_MAX || + ctrl[1]<0 || ctrl[1]>INT_MAX || + newpos+ctrl[0]>newsize) return -1; /* Read diff string */ @@ -102,6 +105,8 @@ int bspatch(const uint8_t* old, int64_t oldsize, uint8_t* new, int64_t newsize, #include #include #include +#include +#include #include #include @@ -129,6 +134,7 @@ int main(int argc,char * argv[]) int64_t oldsize, newsize; BZFILE* bz2; struct bspatch_stream stream; + struct stat sb; if(argc!=4) errx(1,"usage: %s oldfile newfile patchfile\n",argv[0]); @@ -158,6 +164,7 @@ int main(int argc,char * argv[]) ((old=malloc(oldsize+1))==NULL) || (lseek(fd,0,SEEK_SET)!=0) || (read(fd,old,oldsize)!=oldsize) || + (fstat(fd, &sb)) || (close(fd)==-1)) err(1,"%s",argv[1]); if((new=malloc(newsize+1))==NULL) err(1,NULL); @@ -174,7 +181,7 @@ int main(int argc,char * argv[]) fclose(f); /* Write the new file */ - if(((fd=open(argv[2],O_CREAT|O_TRUNC|O_WRONLY,0666))<0) || + if(((fd=open(argv[2],O_CREAT|O_TRUNC|O_WRONLY,sb.st_mode))<0) || (write(fd,new,newsize)!=newsize) || (close(fd)==-1)) err(1,"%s",argv[2]); diff --git a/config.h.in b/config.h.in index 07b665c5..35129ebd 100644 --- a/config.h.in +++ b/config.h.in @@ -24,6 +24,9 @@ /* Define if we should be compatible with pseudo */ #undef ENABLE_WRPSEUDO_COMPAT +/* Define to the FUSE API version */ +#undef FUSE_USE_VERSION + /* The system grub2-mkconfig executable name */ #undef GRUB2_MKCONFIG_PATH diff --git a/configure b/configure index 53b504f0..c20517ca 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libostree 2021.6. +# Generated by GNU Autoconf 2.69 for libostree 2022.1. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libostree' PACKAGE_TARNAME='libostree' -PACKAGE_VERSION='2021.6' -PACKAGE_STRING='libostree 2021.6' +PACKAGE_VERSION='2022.1' +PACKAGE_STRING='libostree 2022.1' PACKAGE_BUGREPORT='walters@verbum.org' PACKAGE_URL='' @@ -664,6 +664,10 @@ BUILDOPT_FUSE_FALSE BUILDOPT_FUSE_TRUE BUILDOPT_FUSE_LIBS BUILDOPT_FUSE_CFLAGS +FUSE_LIBS +FUSE_CFLAGS +FUSE3_LIBS +FUSE3_CFLAGS USE_LIBMOUNT_FALSE USE_LIBMOUNT_TRUE OT_DEP_LIBMOUNT_LIBS @@ -1008,8 +1012,10 @@ OT_DEP_AVAHI_CFLAGS OT_DEP_AVAHI_LIBS OT_DEP_LIBMOUNT_CFLAGS OT_DEP_LIBMOUNT_LIBS -BUILDOPT_FUSE_CFLAGS -BUILDOPT_FUSE_LIBS +FUSE3_CFLAGS +FUSE3_LIBS +FUSE_CFLAGS +FUSE_LIBS LIBSYSTEMD_CFLAGS LIBSYSTEMD_LIBS' @@ -1562,7 +1568,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 2021.6 to adapt to many kinds of systems. +\`configure' configures libostree 2022.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1633,7 +1639,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libostree 2021.6:";; + short | recursive ) echo "Configuration of libostree 2022.1:";; esac cat <<\_ACEOF @@ -1820,10 +1826,11 @@ Some influential environment variables: C compiler flags for OT_DEP_LIBMOUNT, overriding pkg-config OT_DEP_LIBMOUNT_LIBS linker flags for OT_DEP_LIBMOUNT, overriding pkg-config - BUILDOPT_FUSE_CFLAGS - C compiler flags for BUILDOPT_FUSE, overriding pkg-config - BUILDOPT_FUSE_LIBS - linker flags for BUILDOPT_FUSE, overriding pkg-config + FUSE3_CFLAGS + C compiler flags for FUSE3, overriding pkg-config + FUSE3_LIBS linker flags for FUSE3, overriding pkg-config + FUSE_CFLAGS C compiler flags for FUSE, overriding pkg-config + FUSE_LIBS linker flags for FUSE, overriding pkg-config LIBSYSTEMD_CFLAGS C compiler flags for LIBSYSTEMD, overriding pkg-config LIBSYSTEMD_LIBS @@ -1895,7 +1902,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libostree configure 2021.6 +libostree configure 2022.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2367,7 +2374,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 2021.6, which was +It was created by libostree $as_me 2022.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3230,7 +3237,7 @@ fi # Define the identity of the package. PACKAGE='libostree' - VERSION='2021.6' + VERSION='2022.1' # Some tools Automake needs. @@ -5962,11 +5969,11 @@ done test -n "$YACC" || YACC="yacc" -YEAR_VERSION=2021 +YEAR_VERSION=2022 -RELEASE_VERSION=6 +RELEASE_VERSION=1 -PACKAGE_VERSION=2021.6 +PACKAGE_VERSION=2022.1 if echo "$CFLAGS" | grep -q -E -e '-Werror($| )'; then : @@ -16267,6 +16274,7 @@ fi LIBARCHIVE_DEPENDENCY="libarchive >= 2.8.0" +FUSE3_DEPENDENCY="fuse3 >= 3.1.1" # What's in RHEL7.2. FUSE_DEPENDENCY="fuse >= 2.9.2" @@ -17645,19 +17653,19 @@ if test x$enable_rofiles_fuse != xno ; then : pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $FUSE_DEPENDENCY" >&5 -$as_echo_n "checking for $FUSE_DEPENDENCY... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $FUSE3_DEPENDENCY" >&5 +$as_echo_n "checking for $FUSE3_DEPENDENCY... " >&6; } -if test -n "$BUILDOPT_FUSE_CFLAGS"; then - pkg_cv_BUILDOPT_FUSE_CFLAGS="$BUILDOPT_FUSE_CFLAGS" +if test -n "$FUSE3_CFLAGS"; then + pkg_cv_FUSE3_CFLAGS="$FUSE3_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$FUSE_DEPENDENCY\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$FUSE_DEPENDENCY") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$FUSE3_DEPENDENCY\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$FUSE3_DEPENDENCY") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_BUILDOPT_FUSE_CFLAGS=`$PKG_CONFIG --cflags "$FUSE_DEPENDENCY" 2>/dev/null` + pkg_cv_FUSE3_CFLAGS=`$PKG_CONFIG --cflags "$FUSE3_DEPENDENCY" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -17665,16 +17673,16 @@ fi else pkg_failed=untried fi -if test -n "$BUILDOPT_FUSE_LIBS"; then - pkg_cv_BUILDOPT_FUSE_LIBS="$BUILDOPT_FUSE_LIBS" +if test -n "$FUSE3_LIBS"; then + pkg_cv_FUSE3_LIBS="$FUSE3_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$FUSE_DEPENDENCY\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$FUSE_DEPENDENCY") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$FUSE3_DEPENDENCY\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$FUSE3_DEPENDENCY") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_BUILDOPT_FUSE_LIBS=`$PKG_CONFIG --libs "$FUSE_DEPENDENCY" 2>/dev/null` + pkg_cv_FUSE3_LIBS=`$PKG_CONFIG --libs "$FUSE3_DEPENDENCY" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -17695,22 +17703,81 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - BUILDOPT_FUSE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$FUSE_DEPENDENCY" 2>&1` + FUSE3_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$FUSE3_DEPENDENCY" 2>&1` else - BUILDOPT_FUSE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$FUSE_DEPENDENCY" 2>&1` + FUSE3_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$FUSE3_DEPENDENCY" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$BUILDOPT_FUSE_PKG_ERRORS" >&5 + echo "$FUSE3_PKG_ERRORS" >&5 + + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $FUSE_DEPENDENCY" >&5 +$as_echo_n "checking for $FUSE_DEPENDENCY... " >&6; } + +if test -n "$FUSE_CFLAGS"; then + pkg_cv_FUSE_CFLAGS="$FUSE_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$FUSE_DEPENDENCY\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$FUSE_DEPENDENCY") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_FUSE_CFLAGS=`$PKG_CONFIG --cflags "$FUSE_DEPENDENCY" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$FUSE_LIBS"; then + pkg_cv_FUSE_LIBS="$FUSE_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$FUSE_DEPENDENCY\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$FUSE_DEPENDENCY") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_FUSE_LIBS=`$PKG_CONFIG --libs "$FUSE_DEPENDENCY" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + FUSE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$FUSE_DEPENDENCY" 2>&1` + else + FUSE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$FUSE_DEPENDENCY" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$FUSE_PKG_ERRORS" >&5 as_fn_error $? "Package requirements ($FUSE_DEPENDENCY) were not met: -$BUILDOPT_FUSE_PKG_ERRORS +$FUSE_PKG_ERRORS Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables BUILDOPT_FUSE_CFLAGS -and BUILDOPT_FUSE_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables FUSE_CFLAGS +and FUSE_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -17721,19 +17788,139 @@ as_fn_error $? "The pkg-config script could not be found or is too old. Make su is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables BUILDOPT_FUSE_CFLAGS -and BUILDOPT_FUSE_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables FUSE_CFLAGS +and FUSE_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } else - BUILDOPT_FUSE_CFLAGS=$pkg_cv_BUILDOPT_FUSE_CFLAGS - BUILDOPT_FUSE_LIBS=$pkg_cv_BUILDOPT_FUSE_LIBS + FUSE_CFLAGS=$pkg_cv_FUSE_CFLAGS + FUSE_LIBS=$pkg_cv_FUSE_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } + FUSE_USE_VERSION=26 + BUILDOPT_FUSE_CFLAGS="$FUSE_CFLAGS" + BUILDOPT_FUSE_LIBS="$FUSE_LIBS" + fi +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $FUSE_DEPENDENCY" >&5 +$as_echo_n "checking for $FUSE_DEPENDENCY... " >&6; } + +if test -n "$FUSE_CFLAGS"; then + pkg_cv_FUSE_CFLAGS="$FUSE_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$FUSE_DEPENDENCY\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$FUSE_DEPENDENCY") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_FUSE_CFLAGS=`$PKG_CONFIG --cflags "$FUSE_DEPENDENCY" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$FUSE_LIBS"; then + pkg_cv_FUSE_LIBS="$FUSE_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$FUSE_DEPENDENCY\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$FUSE_DEPENDENCY") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_FUSE_LIBS=`$PKG_CONFIG --libs "$FUSE_DEPENDENCY" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + FUSE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$FUSE_DEPENDENCY" 2>&1` + else + FUSE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$FUSE_DEPENDENCY" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$FUSE_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements ($FUSE_DEPENDENCY) were not met: + +$FUSE_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables FUSE_CFLAGS +and FUSE_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables FUSE_CFLAGS +and FUSE_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } +else + FUSE_CFLAGS=$pkg_cv_FUSE_CFLAGS + FUSE_LIBS=$pkg_cv_FUSE_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + FUSE_USE_VERSION=26 + BUILDOPT_FUSE_CFLAGS="$FUSE_CFLAGS" + BUILDOPT_FUSE_LIBS="$FUSE_LIBS" + +fi +else + FUSE3_CFLAGS=$pkg_cv_FUSE3_CFLAGS + FUSE3_LIBS=$pkg_cv_FUSE3_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + FUSE_USE_VERSION=31 + BUILDOPT_FUSE_CFLAGS="$FUSE3_CFLAGS" + BUILDOPT_FUSE_LIBS="$FUSE3_LIBS" + +fi + +cat >>confdefs.h <<_ACEOF +#define FUSE_USE_VERSION $FUSE_USE_VERSION +_ACEOF + + + else enable_rofiles_fuse=no @@ -18882,7 +19069,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 2021.6, which was +This file was extended by libostree $as_me 2022.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18948,7 +19135,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 2021.6 +libostree config.status 2022.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index ff174da8..93b98cb9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ AC_PREREQ([2.63]) dnl To perform a release, follow the instructions in `docs/CONTRIBUTING.md`. -m4_define([year_version], [2021]) -m4_define([release_version], [6]) +m4_define([year_version], [2022]) +m4_define([release_version], [1]) m4_define([package_version], [year_version.release_version]) AC_INIT([libostree], [package_version], [walters@verbum.org]) is_release_build=yes @@ -254,6 +254,7 @@ AS_IF([test x$with_ed25519_libsodium != xno], [ AM_CONDITIONAL(USE_LIBSODIUM, test "x$have_libsodium" = xyes) LIBARCHIVE_DEPENDENCY="libarchive >= 2.8.0" +FUSE3_DEPENDENCY="fuse3 >= 3.1.1" # What's in RHEL7.2. FUSE_DEPENDENCY="fuse >= 2.9.2" @@ -448,8 +449,22 @@ AC_ARG_ENABLE(rofiles-fuse, [generate rofiles-fuse helper [default=yes]])],, enable_rofiles_fuse=yes) AS_IF([ test x$enable_rofiles_fuse != xno ], [ - PKG_CHECK_MODULES(BUILDOPT_FUSE, $FUSE_DEPENDENCY) -], [enable_rofiles_fuse=no]) + PKG_CHECK_MODULES([FUSE3], [$FUSE3_DEPENDENCY], + [ + FUSE_USE_VERSION=31 + BUILDOPT_FUSE_CFLAGS="$FUSE3_CFLAGS" + BUILDOPT_FUSE_LIBS="$FUSE3_LIBS" + ], + [PKG_CHECK_MODULES([FUSE], [$FUSE_DEPENDENCY], + [ + FUSE_USE_VERSION=26 + BUILDOPT_FUSE_CFLAGS="$FUSE_CFLAGS" + BUILDOPT_FUSE_LIBS="$FUSE_LIBS" + ])]) + AC_DEFINE_UNQUOTED([FUSE_USE_VERSION], [$FUSE_USE_VERSION], [Define to the FUSE API version]) + AC_SUBST([BUILDOPT_FUSE_CFLAGS]) + AC_SUBST([BUILDOPT_FUSE_LIBS]) + ], [enable_rofiles_fuse=no]) AM_CONDITIONAL(BUILDOPT_FUSE, test x$enable_rofiles_fuse = xyes) AC_ARG_WITH(dracut, diff --git a/man/ostree-admin-cleanup.xml b/man/ostree-admin-cleanup.xml index b7dfb653..dba4b62b 100644 --- a/man/ostree-admin-cleanup.xml +++ b/man/ostree-admin-cleanup.xml @@ -18,9 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +License along with this library. If not, see . --> diff --git a/man/ostree-admin-config-diff.xml b/man/ostree-admin-config-diff.xml index b1c81736..88c2f397 100644 --- a/man/ostree-admin-config-diff.xml +++ b/man/ostree-admin-config-diff.xml @@ -18,9 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +License along with this library. If not, see . --> diff --git a/man/ostree-admin-deploy.xml b/man/ostree-admin-deploy.xml index fbb8b96a..0d73b8e1 100644 --- a/man/ostree-admin-deploy.xml +++ b/man/ostree-admin-deploy.xml @@ -18,9 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +License along with this library. If not, see . --> diff --git a/man/ostree-admin-init-fs.xml b/man/ostree-admin-init-fs.xml index 3a93e51e..50e6d44e 100644 --- a/man/ostree-admin-init-fs.xml +++ b/man/ostree-admin-init-fs.xml @@ -18,9 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +License along with this library. If not, see . --> diff --git a/man/ostree-admin-instutil.xml b/man/ostree-admin-instutil.xml index 323c6e6e..b7e9f635 100644 --- a/man/ostree-admin-instutil.xml +++ b/man/ostree-admin-instutil.xml @@ -18,9 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +License along with this library. If not, see . --> diff --git a/man/ostree-admin-os-init.xml b/man/ostree-admin-os-init.xml index 51cb24ee..fbe1ec74 100644 --- a/man/ostree-admin-os-init.xml +++ b/man/ostree-admin-os-init.xml @@ -18,9 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +License along with this library. If not, see . --> diff --git a/man/ostree-admin-pin.xml b/man/ostree-admin-pin.xml index db0787ae..ba3aa4a0 100644 --- a/man/ostree-admin-pin.xml +++ b/man/ostree-admin-pin.xml @@ -18,9 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +License along with this library. If not, see . --> diff --git a/man/ostree-admin-set-origin.xml b/man/ostree-admin-set-origin.xml index c52c410c..6c72cc9f 100644 --- a/man/ostree-admin-set-origin.xml +++ b/man/ostree-admin-set-origin.xml @@ -18,9 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +License along with this library. If not, see . --> diff --git a/man/ostree-admin-status.xml b/man/ostree-admin-status.xml index 020c601a..dde099b0 100644 --- a/man/ostree-admin-status.xml +++ b/man/ostree-admin-status.xml @@ -18,9 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +License along with this library. If not, see . --> diff --git a/man/ostree-admin-switch.xml b/man/ostree-admin-switch.xml index 0fba9eb3..720cabdd 100644 --- a/man/ostree-admin-switch.xml +++ b/man/ostree-admin-switch.xml @@ -18,9 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +License along with this library. If not, see . --> diff --git a/man/ostree-admin-undeploy.xml b/man/ostree-admin-undeploy.xml index 4fde382f..9768c87f 100644 --- a/man/ostree-admin-undeploy.xml +++ b/man/ostree-admin-undeploy.xml @@ -18,9 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +License along with this library. If not, see . --> diff --git a/man/ostree-admin-unlock.xml b/man/ostree-admin-unlock.xml index e07f72ad..d499419a 100644 --- a/man/ostree-admin-unlock.xml +++ b/man/ostree-admin-unlock.xml @@ -18,9 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +License along with this library. If not, see . --> diff --git a/man/ostree-admin-upgrade.xml b/man/ostree-admin-upgrade.xml index 002a2170..ccf7a65b 100644 --- a/man/ostree-admin-upgrade.xml +++ b/man/ostree-admin-upgrade.xml @@ -18,9 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +License along with this library. If not, see . --> diff --git a/man/ostree-admin.xml b/man/ostree-admin.xml index 5dc81466..85f4347d 100644 --- a/man/ostree-admin.xml +++ b/man/ostree-admin.xml @@ -18,9 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +License along with this library. If not, see . --> diff --git a/man/ostree-cat.xml b/man/ostree-cat.xml index cf1cdb15..9c4c3279 100644 --- a/man/ostree-cat.xml +++ b/man/ostree-cat.xml @@ -18,9 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +License along with this library. If not, see . --> diff --git a/man/ostree-checkout.xml b/man/ostree-checkout.xml index dfa2ce16..4ed53a91 100644 --- a/man/ostree-checkout.xml +++ b/man/ostree-checkout.xml @@ -18,9 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +License along with this library. If not, see . --> diff --git a/man/ostree-checksum.xml b/man/ostree-checksum.xml index ae7aa96a..9ea24d25 100644 --- a/man/ostree-checksum.xml +++ b/man/ostree-checksum.xml @@ -18,9 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +License along with this library. If not, see . --> diff --git a/man/ostree-commit.xml b/man/ostree-commit.xml index e1e3a8b9..e9640643 100644 --- a/man/ostree-commit.xml +++ b/man/ostree-commit.xml @@ -18,9 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +License along with this library. If not, see . --> diff --git a/man/ostree-config.xml b/man/ostree-config.xml index e5391bbf..a5db2772 100644 --- a/man/ostree-config.xml +++ b/man/ostree-config.xml @@ -18,9 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +License along with this library. If not, see . --> diff --git a/man/ostree-create-usb.xml b/man/ostree-create-usb.xml index 90b2fc5b..600d7ce9 100644 --- a/man/ostree-create-usb.xml +++ b/man/ostree-create-usb.xml @@ -18,9 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +License along with this library. If not, see . --> diff --git a/man/ostree-diff.xml b/man/ostree-diff.xml index 0b7ac892..5ddc76b6 100644 --- a/man/ostree-diff.xml +++ b/man/ostree-diff.xml @@ -18,9 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +License along with this library. If not, see . --> diff --git a/man/ostree-export.xml b/man/ostree-export.xml index 019fd655..a0a8be23 100644 --- a/man/ostree-export.xml +++ b/man/ostree-export.xml @@ -18,9 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +License along with this library. If not, see . --> diff --git a/man/ostree-find-remotes.xml b/man/ostree-find-remotes.xml index 89e278d7..95664a89 100644 --- a/man/ostree-find-remotes.xml +++ b/man/ostree-find-remotes.xml @@ -18,9 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +License along with this library. If not, see . --> diff --git a/man/ostree-fsck.xml b/man/ostree-fsck.xml index 4e292db6..03993440 100644 --- a/man/ostree-fsck.xml +++ b/man/ostree-fsck.xml @@ -18,9 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +License along with this library. If not, see . --> diff --git a/man/ostree-gpg-sign.xml b/man/ostree-gpg-sign.xml index a6120f07..9eec2bbc 100644 --- a/man/ostree-gpg-sign.xml +++ b/man/ostree-gpg-sign.xml @@ -18,9 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +License along with this library. If not, see . --> diff --git a/man/ostree-init.xml b/man/ostree-init.xml index b2726321..53391d62 100644 --- a/man/ostree-init.xml +++ b/man/ostree-init.xml @@ -18,9 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +License along with this library. If not, see . --> diff --git a/man/ostree-log.xml b/man/ostree-log.xml index 0b7d3488..7685ecf0 100644 --- a/man/ostree-log.xml +++ b/man/ostree-log.xml @@ -18,9 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +License along with this library. If not, see . --> diff --git a/man/ostree-ls.xml b/man/ostree-ls.xml index a0a9bb5f..9cd1623e 100644 --- a/man/ostree-ls.xml +++ b/man/ostree-ls.xml @@ -18,9 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +License along with this library. If not, see . --> diff --git a/man/ostree-prune.xml b/man/ostree-prune.xml index f1b517f3..e7e028ab 100644 --- a/man/ostree-prune.xml +++ b/man/ostree-prune.xml @@ -18,9 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +License along with this library. If not, see . --> diff --git a/man/ostree-pull-local.xml b/man/ostree-pull-local.xml index 8bbf36a9..11060d62 100644 --- a/man/ostree-pull-local.xml +++ b/man/ostree-pull-local.xml @@ -18,9 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +License along with this library. If not, see . --> diff --git a/man/ostree-pull.xml b/man/ostree-pull.xml index 593b2d27..0915dd27 100644 --- a/man/ostree-pull.xml +++ b/man/ostree-pull.xml @@ -18,9 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +License along with this library. If not, see . --> diff --git a/man/ostree-refs.xml b/man/ostree-refs.xml index 62aac5ce..97d69fd7 100644 --- a/man/ostree-refs.xml +++ b/man/ostree-refs.xml @@ -18,9 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +License along with this library. If not, see . --> diff --git a/man/ostree-remote.xml b/man/ostree-remote.xml index 20fe0a19..b14fc6d4 100644 --- a/man/ostree-remote.xml +++ b/man/ostree-remote.xml @@ -18,9 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +License along with this library. If not, see . --> diff --git a/man/ostree-reset.xml b/man/ostree-reset.xml index e52a1ec2..d2da58cb 100644 --- a/man/ostree-reset.xml +++ b/man/ostree-reset.xml @@ -18,9 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +License along with this library. If not, see . --> diff --git a/man/ostree-rev-parse.xml b/man/ostree-rev-parse.xml index 66a4e198..74c585fd 100644 --- a/man/ostree-rev-parse.xml +++ b/man/ostree-rev-parse.xml @@ -18,9 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +License along with this library. If not, see . --> diff --git a/man/ostree-show.xml b/man/ostree-show.xml index a28f704c..4495b1e6 100644 --- a/man/ostree-show.xml +++ b/man/ostree-show.xml @@ -18,9 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +License along with this library. If not, see . --> diff --git a/man/ostree-sign.xml b/man/ostree-sign.xml index 50c0b337..eb63f7ff 100644 --- a/man/ostree-sign.xml +++ b/man/ostree-sign.xml @@ -18,9 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +License along with this library. If not, see . --> diff --git a/man/ostree-static-delta.xml b/man/ostree-static-delta.xml index 440ada41..4936ada5 100644 --- a/man/ostree-static-delta.xml +++ b/man/ostree-static-delta.xml @@ -18,9 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +License along with this library. If not, see . --> diff --git a/man/ostree-summary.xml b/man/ostree-summary.xml index 8305b4e1..4c9652cc 100644 --- a/man/ostree-summary.xml +++ b/man/ostree-summary.xml @@ -18,9 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +License along with this library. If not, see . --> diff --git a/man/ostree-trivial-httpd.xml b/man/ostree-trivial-httpd.xml index d03c12be..7ba1dae8 100644 --- a/man/ostree-trivial-httpd.xml +++ b/man/ostree-trivial-httpd.xml @@ -18,9 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +License along with this library. If not, see . --> diff --git a/man/ostree.repo-config.xml b/man/ostree.repo-config.xml index 6e2bc7cc..3fa02cac 100644 --- a/man/ostree.repo-config.xml +++ b/man/ostree.repo-config.xml @@ -18,9 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +License along with this library. If not, see . --> diff --git a/man/ostree.repo.xml b/man/ostree.repo.xml index 0553b63b..84860c28 100644 --- a/man/ostree.repo.xml +++ b/man/ostree.repo.xml @@ -18,9 +18,7 @@ SPDX-License-Identifier: LGPL-2.0+ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + License along with this library. If not, see . --> diff --git a/man/ostree.xml b/man/ostree.xml index e280a024..c06c6121 100644 --- a/man/ostree.xml +++ b/man/ostree.xml @@ -18,9 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +License along with this library. If not, see . --> diff --git a/man/rofiles-fuse.xml b/man/rofiles-fuse.xml index 4a48ce9b..f4d23739 100644 --- a/man/rofiles-fuse.xml +++ b/man/rofiles-fuse.xml @@ -18,9 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +License along with this library. If not, see . --> diff --git a/src/boot/dracut/module-setup.sh b/src/boot/dracut/module-setup.sh index 4d12fae6..bedf584e 100755 --- a/src/boot/dracut/module-setup.sh +++ b/src/boot/dracut/module-setup.sh @@ -17,9 +17,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . check() { if [[ -x $systemdutildir/systemd ]] && [[ -x /usr/lib/ostree/ostree-prepare-root ]]; then diff --git a/src/boot/dracut/ostree.conf b/src/boot/dracut/ostree.conf index ac70494b..d83d017b 100755 --- a/src/boot/dracut/ostree.conf +++ b/src/boot/dracut/ostree.conf @@ -11,9 +11,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . add_dracutmodules+=" ostree systemd " reproducible=yes diff --git a/src/boot/grub2/grub2-15_ostree b/src/boot/grub2/grub2-15_ostree index 9042708e..ecd618c9 100644 --- a/src/boot/grub2/grub2-15_ostree +++ b/src/boot/grub2/grub2-15_ostree @@ -13,9 +13,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General -# Public License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place, Suite 330, -# Boston, MA 02111-1307, USA. +# Public License along with this library. If not, see . # Gracefully exit if ostree is not installed, or there's # no system repository initialized. diff --git a/src/boot/ostree-finalize-staged.path b/src/boot/ostree-finalize-staged.path index f0f76151..43ef0cae 100644 --- a/src/boot/ostree-finalize-staged.path +++ b/src/boot/ostree-finalize-staged.path @@ -11,9 +11,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . # For some implementation discussion, see: # https://lists.freedesktop.org/archives/systemd-devel/2018-March/040557.html diff --git a/src/boot/ostree-finalize-staged.service b/src/boot/ostree-finalize-staged.service index 90e212b0..2f28bbb7 100644 --- a/src/boot/ostree-finalize-staged.service +++ b/src/boot/ostree-finalize-staged.service @@ -11,9 +11,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . # For some implementation discussion, see: # https://lists.freedesktop.org/archives/systemd-devel/2018-March/040557.html diff --git a/src/boot/ostree-prepare-root.service b/src/boot/ostree-prepare-root.service index 250ffe71..510d866a 100644 --- a/src/boot/ostree-prepare-root.service +++ b/src/boot/ostree-prepare-root.service @@ -11,9 +11,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . [Unit] Description=OSTree Prepare OS/ diff --git a/src/boot/ostree-remount.service b/src/boot/ostree-remount.service index a54114f9..7c0d01a3 100644 --- a/src/boot/ostree-remount.service +++ b/src/boot/ostree-remount.service @@ -11,9 +11,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . [Unit] Description=OSTree Remount OS/ Bind Mounts diff --git a/src/boot/ostree-tmpfiles.conf b/src/boot/ostree-tmpfiles.conf index 49e2dcb3..4cbba0bd 100644 --- a/src/boot/ostree-tmpfiles.conf +++ b/src/boot/ostree-tmpfiles.conf @@ -11,9 +11,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . # https://github.com/ostreedev/ostree/issues/393 R! /var/tmp/ostree-unlock-ovl.* diff --git a/src/libostree/libostree-devel.sym b/src/libostree/libostree-devel.sym index e3cd14a4..9168db73 100644 --- a/src/libostree/libostree-devel.sym +++ b/src/libostree/libostree-devel.sym @@ -12,9 +12,7 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + License along with this library. If not, see . How to introduce the first new symbol for a development version: - copy the stub content below to a new entry diff --git a/src/libostree/libostree-released.sym b/src/libostree/libostree-released.sym index d38362ba..5349de63 100644 --- a/src/libostree/libostree-released.sym +++ b/src/libostree/libostree-released.sym @@ -14,9 +14,7 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + License along with this library. If not, see . ***/ /* DO NOT EDIT this file - use libostree-devel.sym instead. Release diff --git a/src/libostree/ostree-async-progress.c b/src/libostree/ostree-async-progress.c index 8d6fdfe5..edbde11c 100644 --- a/src/libostree/ostree-async-progress.c +++ b/src/libostree/ostree-async-progress.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/libostree/ostree-async-progress.h b/src/libostree/ostree-async-progress.h index 475d7f62..afd45f1f 100644 --- a/src/libostree/ostree-async-progress.h +++ b/src/libostree/ostree-async-progress.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #pragma once diff --git a/src/libostree/ostree-autocleanups.h b/src/libostree/ostree-autocleanups.h index 14017012..56274949 100644 --- a/src/libostree/ostree-autocleanups.h +++ b/src/libostree/ostree-autocleanups.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Krzesimir Nowak */ diff --git a/src/libostree/ostree-bloom-private.h b/src/libostree/ostree-bloom-private.h index 1c5acb8f..e9ec2baf 100644 --- a/src/libostree/ostree-bloom-private.h +++ b/src/libostree/ostree-bloom-private.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Authors: * - Philip Withnall diff --git a/src/libostree/ostree-bloom.c b/src/libostree/ostree-bloom.c index 94edac62..8c1017d7 100644 --- a/src/libostree/ostree-bloom.c +++ b/src/libostree/ostree-bloom.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Authors: * - Philip Withnall diff --git a/src/libostree/ostree-bootconfig-parser.c b/src/libostree/ostree-bootconfig-parser.c index a36a4118..e005fab9 100644 --- a/src/libostree/ostree-bootconfig-parser.c +++ b/src/libostree/ostree-bootconfig-parser.c @@ -12,9 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * Public License along with this library. If not, see . */ #include "config.h" diff --git a/src/libostree/ostree-bootconfig-parser.h b/src/libostree/ostree-bootconfig-parser.h index d03c931c..6d8359da 100644 --- a/src/libostree/ostree-bootconfig-parser.h +++ b/src/libostree/ostree-bootconfig-parser.h @@ -12,9 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * Public License along with this library. If not, see . */ #pragma once diff --git a/src/libostree/ostree-bootloader-grub2.c b/src/libostree/ostree-bootloader-grub2.c index 0ef751dc..fff3b95c 100644 --- a/src/libostree/ostree-bootloader-grub2.c +++ b/src/libostree/ostree-bootloader-grub2.c @@ -12,9 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * Public License along with this library. If not, see . */ #include "config.h" diff --git a/src/libostree/ostree-bootloader-grub2.h b/src/libostree/ostree-bootloader-grub2.h index 7aaa1698..2b0d99c5 100644 --- a/src/libostree/ostree-bootloader-grub2.h +++ b/src/libostree/ostree-bootloader-grub2.h @@ -12,9 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * Public License along with this library. If not, see . */ #pragma once diff --git a/src/libostree/ostree-bootloader-syslinux.c b/src/libostree/ostree-bootloader-syslinux.c index 0055896b..8add0f11 100644 --- a/src/libostree/ostree-bootloader-syslinux.c +++ b/src/libostree/ostree-bootloader-syslinux.c @@ -12,9 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * Public License along with this library. If not, see . */ #include "config.h" diff --git a/src/libostree/ostree-bootloader-syslinux.h b/src/libostree/ostree-bootloader-syslinux.h index df4a9391..bed9a6c8 100644 --- a/src/libostree/ostree-bootloader-syslinux.h +++ b/src/libostree/ostree-bootloader-syslinux.h @@ -12,9 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * Public License along with this library. If not, see . */ #pragma once diff --git a/src/libostree/ostree-bootloader-uboot.c b/src/libostree/ostree-bootloader-uboot.c index 7e23001e..fb2c2fcf 100644 --- a/src/libostree/ostree-bootloader-uboot.c +++ b/src/libostree/ostree-bootloader-uboot.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * Public License along with this library. If not, see . * * Author: Javier Martinez Canillas */ diff --git a/src/libostree/ostree-bootloader-uboot.h b/src/libostree/ostree-bootloader-uboot.h index 89d7b47a..ac777fa9 100644 --- a/src/libostree/ostree-bootloader-uboot.h +++ b/src/libostree/ostree-bootloader-uboot.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * Public License along with this library. If not, see . * * Author: Javier Martinez Canillas */ diff --git a/src/libostree/ostree-bootloader-zipl.c b/src/libostree/ostree-bootloader-zipl.c index 4ac785d9..a7078aea 100644 --- a/src/libostree/ostree-bootloader-zipl.c +++ b/src/libostree/ostree-bootloader-zipl.c @@ -12,9 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * Public License along with this library. If not, see . */ #include "config.h" diff --git a/src/libostree/ostree-bootloader-zipl.h b/src/libostree/ostree-bootloader-zipl.h index 79e84912..3584feb2 100644 --- a/src/libostree/ostree-bootloader-zipl.h +++ b/src/libostree/ostree-bootloader-zipl.h @@ -12,9 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * Public License along with this library. If not, see . */ #pragma once diff --git a/src/libostree/ostree-bootloader.c b/src/libostree/ostree-bootloader.c index 76b7bb82..f221b608 100644 --- a/src/libostree/ostree-bootloader.c +++ b/src/libostree/ostree-bootloader.c @@ -12,9 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * Public License along with this library. If not, see . */ #include "config.h" diff --git a/src/libostree/ostree-bootloader.h b/src/libostree/ostree-bootloader.h index 48a7a9cd..6e0f6f88 100644 --- a/src/libostree/ostree-bootloader.h +++ b/src/libostree/ostree-bootloader.h @@ -12,9 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * Public License along with this library. If not, see . */ #pragma once diff --git a/src/libostree/ostree-chain-input-stream.c b/src/libostree/ostree-chain-input-stream.c index dd45ca52..879d10c7 100644 --- a/src/libostree/ostree-chain-input-stream.c +++ b/src/libostree/ostree-chain-input-stream.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * Public License along with this library. If not, see . */ #include "config.h" diff --git a/src/libostree/ostree-chain-input-stream.h b/src/libostree/ostree-chain-input-stream.h index a49e370a..539f0ebc 100644 --- a/src/libostree/ostree-chain-input-stream.h +++ b/src/libostree/ostree-chain-input-stream.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * Public License along with this library. If not, see . * */ diff --git a/src/libostree/ostree-checksum-input-stream.c b/src/libostree/ostree-checksum-input-stream.c index f5f1f9e1..8cef10d3 100644 --- a/src/libostree/ostree-checksum-input-stream.c +++ b/src/libostree/ostree-checksum-input-stream.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * Public License along with this library. If not, see . */ #include "config.h" diff --git a/src/libostree/ostree-checksum-input-stream.h b/src/libostree/ostree-checksum-input-stream.h index 061b119c..4138cd7e 100644 --- a/src/libostree/ostree-checksum-input-stream.h +++ b/src/libostree/ostree-checksum-input-stream.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * Public License along with this library. If not, see . * */ diff --git a/src/libostree/ostree-cmdprivate.c b/src/libostree/ostree-cmdprivate.c index 86793790..c9a6e2e1 100644 --- a/src/libostree/ostree-cmdprivate.c +++ b/src/libostree/ostree-cmdprivate.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/libostree/ostree-cmdprivate.h b/src/libostree/ostree-cmdprivate.h index 592157bf..46452ebd 100644 --- a/src/libostree/ostree-cmdprivate.h +++ b/src/libostree/ostree-cmdprivate.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #pragma once diff --git a/src/libostree/ostree-content-writer.c b/src/libostree/ostree-content-writer.c index 2e375307..fa4180ac 100644 --- a/src/libostree/ostree-content-writer.c +++ b/src/libostree/ostree-content-writer.c @@ -12,9 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * Public License along with this library. If not, see . */ #include "config.h" diff --git a/src/libostree/ostree-content-writer.h b/src/libostree/ostree-content-writer.h index 87a85aa0..219860dd 100644 --- a/src/libostree/ostree-content-writer.h +++ b/src/libostree/ostree-content-writer.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #pragma once diff --git a/src/libostree/ostree-core-private.h b/src/libostree/ostree-core-private.h index 89d95ad9..34f86a6c 100644 --- a/src/libostree/ostree-core-private.h +++ b/src/libostree/ostree-core-private.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #pragma once diff --git a/src/libostree/ostree-core.c b/src/libostree/ostree-core.c index aecaf31a..0abd90a4 100644 --- a/src/libostree/ostree-core.c +++ b/src/libostree/ostree-core.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/libostree/ostree-core.h b/src/libostree/ostree-core.h index 7dc1ffb7..36e61290 100644 --- a/src/libostree/ostree-core.h +++ b/src/libostree/ostree-core.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/libostree/ostree-date-utils-private.h b/src/libostree/ostree-date-utils-private.h index f9b8b3e0..f48a696c 100644 --- a/src/libostree/ostree-date-utils-private.h +++ b/src/libostree/ostree-date-utils-private.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Authors: * - Philip Withnall diff --git a/src/libostree/ostree-date-utils.c b/src/libostree/ostree-date-utils.c index 8076e084..a7156911 100644 --- a/src/libostree/ostree-date-utils.c +++ b/src/libostree/ostree-date-utils.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Authors: * - Philip Withnall diff --git a/src/libostree/ostree-deployment-private.h b/src/libostree/ostree-deployment-private.h index b339ae26..5d16798c 100644 --- a/src/libostree/ostree-deployment-private.h +++ b/src/libostree/ostree-deployment-private.h @@ -12,9 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * Public License along with this library. If not, see . */ #pragma once diff --git a/src/libostree/ostree-deployment.c b/src/libostree/ostree-deployment.c index 6397d786..30e82a63 100644 --- a/src/libostree/ostree-deployment.c +++ b/src/libostree/ostree-deployment.c @@ -12,9 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * Public License along with this library. If not, see . */ #include "config.h" diff --git a/src/libostree/ostree-deployment.h b/src/libostree/ostree-deployment.h index dcfa25ec..68a0ff77 100644 --- a/src/libostree/ostree-deployment.h +++ b/src/libostree/ostree-deployment.h @@ -12,9 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * Public License along with this library. If not, see . */ #pragma once diff --git a/src/libostree/ostree-diff.c b/src/libostree/ostree-diff.c index a5c02b7b..d6d8e98a 100644 --- a/src/libostree/ostree-diff.c +++ b/src/libostree/ostree-diff.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/libostree/ostree-diff.h b/src/libostree/ostree-diff.h index b53125ac..be50c638 100644 --- a/src/libostree/ostree-diff.h +++ b/src/libostree/ostree-diff.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/libostree/ostree-dummy-enumtypes.c b/src/libostree/ostree-dummy-enumtypes.c index dfb9d797..b03d61c4 100644 --- a/src/libostree/ostree-dummy-enumtypes.c +++ b/src/libostree/ostree-dummy-enumtypes.c @@ -16,9 +16,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "ostree-dummy-enumtypes.h" diff --git a/src/libostree/ostree-dummy-enumtypes.h b/src/libostree/ostree-dummy-enumtypes.h index 5de454c9..6284644d 100644 --- a/src/libostree/ostree-dummy-enumtypes.h +++ b/src/libostree/ostree-dummy-enumtypes.h @@ -16,9 +16,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #pragma once diff --git a/src/libostree/ostree-enumtypes.c.template b/src/libostree/ostree-enumtypes.c.template index 827ad911..72c64601 100644 --- a/src/libostree/ostree-enumtypes.c.template +++ b/src/libostree/ostree-enumtypes.c.template @@ -13,9 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/libostree/ostree-enumtypes.h.template b/src/libostree/ostree-enumtypes.h.template index ec20fe0d..5043295b 100644 --- a/src/libostree/ostree-enumtypes.h.template +++ b/src/libostree/ostree-enumtypes.h.template @@ -13,9 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ /*** END file-header ***/ diff --git a/src/libostree/ostree-fetcher-curl.c b/src/libostree/ostree-fetcher-curl.c index d6534b46..35769f8a 100644 --- a/src/libostree/ostree-fetcher-curl.c +++ b/src/libostree/ostree-fetcher-curl.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" @@ -770,8 +768,8 @@ initiate_next_curl_request (FetcherRequest *req, curl_easy_setopt (req->easy, CURLOPT_URL, uri); } - curl_easy_setopt (req->easy, CURLOPT_USERAGENT, - self->custom_user_agent ?: OSTREE_FETCHER_USERAGENT_STRING); + (void) curl_easy_setopt (req->easy, CURLOPT_USERAGENT, + self->custom_user_agent ?: OSTREE_FETCHER_USERAGENT_STRING); /* Set caching request headers */ if (req->if_none_match != NULL) diff --git a/src/libostree/ostree-fetcher-soup.c b/src/libostree/ostree-fetcher-soup.c index 7df48482..be87f81e 100644 --- a/src/libostree/ostree-fetcher-soup.c +++ b/src/libostree/ostree-fetcher-soup.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/libostree/ostree-fetcher-uri.c b/src/libostree/ostree-fetcher-uri.c index a08c623e..13bcb8f2 100644 --- a/src/libostree/ostree-fetcher-uri.c +++ b/src/libostree/ostree-fetcher-uri.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/libostree/ostree-fetcher-util.c b/src/libostree/ostree-fetcher-util.c index 76f6bba1..7aeb035a 100644 --- a/src/libostree/ostree-fetcher-util.c +++ b/src/libostree/ostree-fetcher-util.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/libostree/ostree-fetcher-util.h b/src/libostree/ostree-fetcher-util.h index 2cbaf5fa..edbcd32b 100644 --- a/src/libostree/ostree-fetcher-util.h +++ b/src/libostree/ostree-fetcher-util.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #pragma once diff --git a/src/libostree/ostree-fetcher.h b/src/libostree/ostree-fetcher.h index c02ac38c..3c91762a 100644 --- a/src/libostree/ostree-fetcher.h +++ b/src/libostree/ostree-fetcher.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #pragma once diff --git a/src/libostree/ostree-gpg-verifier.c b/src/libostree/ostree-gpg-verifier.c index e9f5c5e3..16b87c6f 100644 --- a/src/libostree/ostree-gpg-verifier.c +++ b/src/libostree/ostree-gpg-verifier.c @@ -15,9 +15,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Sjoerd Simons */ diff --git a/src/libostree/ostree-gpg-verifier.h b/src/libostree/ostree-gpg-verifier.h index 3d803c49..34329bb3 100644 --- a/src/libostree/ostree-gpg-verifier.h +++ b/src/libostree/ostree-gpg-verifier.h @@ -15,9 +15,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Sjoerd Simons */ diff --git a/src/libostree/ostree-gpg-verify-result-dummy.c b/src/libostree/ostree-gpg-verify-result-dummy.c index a62ff915..e0116518 100644 --- a/src/libostree/ostree-gpg-verify-result-dummy.c +++ b/src/libostree/ostree-gpg-verify-result-dummy.c @@ -15,9 +15,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/libostree/ostree-gpg-verify-result-private.h b/src/libostree/ostree-gpg-verify-result-private.h index 66d7e565..7182dacc 100644 --- a/src/libostree/ostree-gpg-verify-result-private.h +++ b/src/libostree/ostree-gpg-verify-result-private.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #pragma once diff --git a/src/libostree/ostree-gpg-verify-result.c b/src/libostree/ostree-gpg-verify-result.c index 67270c82..7bf45aac 100644 --- a/src/libostree/ostree-gpg-verify-result.c +++ b/src/libostree/ostree-gpg-verify-result.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/libostree/ostree-gpg-verify-result.h b/src/libostree/ostree-gpg-verify-result.h index 8f243fcd..05e4403b 100644 --- a/src/libostree/ostree-gpg-verify-result.h +++ b/src/libostree/ostree-gpg-verify-result.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #pragma once diff --git a/src/libostree/ostree-impl-system-generator.c b/src/libostree/ostree-impl-system-generator.c index b5a7cde2..769f0cbd 100644 --- a/src/libostree/ostree-impl-system-generator.c +++ b/src/libostree/ostree-impl-system-generator.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/libostree/ostree-kernel-args.c b/src/libostree/ostree-kernel-args.c index c6300823..40f11e99 100644 --- a/src/libostree/ostree-kernel-args.c +++ b/src/libostree/ostree-kernel-args.c @@ -12,9 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * Public License along with this library. If not, see . */ #include "config.h" diff --git a/src/libostree/ostree-kernel-args.h b/src/libostree/ostree-kernel-args.h index 5c8be0c0..dde0312f 100644 --- a/src/libostree/ostree-kernel-args.h +++ b/src/libostree/ostree-kernel-args.h @@ -12,9 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * Public License along with this library. If not, see . */ #pragma once diff --git a/src/libostree/ostree-libarchive-input-stream.c b/src/libostree/ostree-libarchive-input-stream.c index 4de05e2a..f80bd77c 100644 --- a/src/libostree/ostree-libarchive-input-stream.c +++ b/src/libostree/ostree-libarchive-input-stream.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * Public License along with this library. If not, see . */ #include "config.h" diff --git a/src/libostree/ostree-libarchive-input-stream.h b/src/libostree/ostree-libarchive-input-stream.h index 4d1937fa..a71a6d58 100644 --- a/src/libostree/ostree-libarchive-input-stream.h +++ b/src/libostree/ostree-libarchive-input-stream.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * Public License along with this library. If not, see . * * Author: Alexander Larsson */ diff --git a/src/libostree/ostree-libarchive-private.h b/src/libostree/ostree-libarchive-private.h index 46da3e18..6e6daddb 100644 --- a/src/libostree/ostree-libarchive-private.h +++ b/src/libostree/ostree-libarchive-private.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * Public License along with this library. If not, see . * * Author: Alexander Larsson */ diff --git a/src/libostree/ostree-linuxfsutil.c b/src/libostree/ostree-linuxfsutil.c index cb778def..97f93604 100644 --- a/src/libostree/ostree-linuxfsutil.c +++ b/src/libostree/ostree-linuxfsutil.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/libostree/ostree-linuxfsutil.h b/src/libostree/ostree-linuxfsutil.h index c9964610..0654b6fc 100644 --- a/src/libostree/ostree-linuxfsutil.h +++ b/src/libostree/ostree-linuxfsutil.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #pragma once diff --git a/src/libostree/ostree-metalink.c b/src/libostree/ostree-metalink.c index 6381b31e..7178f34f 100644 --- a/src/libostree/ostree-metalink.c +++ b/src/libostree/ostree-metalink.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/libostree/ostree-metalink.h b/src/libostree/ostree-metalink.h index 1a48945f..68400cdf 100644 --- a/src/libostree/ostree-metalink.h +++ b/src/libostree/ostree-metalink.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #pragma once diff --git a/src/libostree/ostree-mutable-tree.c b/src/libostree/ostree-mutable-tree.c index bba3cf91..91023ca9 100644 --- a/src/libostree/ostree-mutable-tree.c +++ b/src/libostree/ostree-mutable-tree.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/libostree/ostree-mutable-tree.h b/src/libostree/ostree-mutable-tree.h index 9bf36802..384ff252 100644 --- a/src/libostree/ostree-mutable-tree.h +++ b/src/libostree/ostree-mutable-tree.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/libostree/ostree-ref.c b/src/libostree/ostree-ref.c index ea372b84..eb77d97c 100644 --- a/src/libostree/ostree-ref.c +++ b/src/libostree/ostree-ref.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Authors: * - Philip Withnall diff --git a/src/libostree/ostree-ref.h b/src/libostree/ostree-ref.h index 8df685ed..384b8480 100644 --- a/src/libostree/ostree-ref.h +++ b/src/libostree/ostree-ref.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Authors: * - Philip Withnall diff --git a/src/libostree/ostree-remote-private.h b/src/libostree/ostree-remote-private.h index bf74f613..eba74305 100644 --- a/src/libostree/ostree-remote-private.h +++ b/src/libostree/ostree-remote-private.h @@ -16,9 +16,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Authors: * - Colin Walters diff --git a/src/libostree/ostree-remote.c b/src/libostree/ostree-remote.c index 93c1a328..04f08352 100644 --- a/src/libostree/ostree-remote.c +++ b/src/libostree/ostree-remote.c @@ -16,9 +16,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Authors: * - Colin Walters diff --git a/src/libostree/ostree-remote.h b/src/libostree/ostree-remote.h index a785b4e6..3230ff8c 100644 --- a/src/libostree/ostree-remote.h +++ b/src/libostree/ostree-remote.h @@ -16,9 +16,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Authors: * - Colin Walters diff --git a/src/libostree/ostree-repo-checkout.c b/src/libostree/ostree-repo-checkout.c index 93e4311d..663292a9 100644 --- a/src/libostree/ostree-repo-checkout.c +++ b/src/libostree/ostree-repo-checkout.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c index 8ac963e7..e2c86d96 100644 --- a/src/libostree/ostree-repo-commit.c +++ b/src/libostree/ostree-repo-commit.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ @@ -1683,8 +1681,8 @@ ostree_repo_prepare_transaction (OstreeRepo *self, /* Set up to abort the transaction if we return early from this function. * This needs to be manually built here due to a circular dependency. */ g_autoptr(OstreeRepoAutoTransaction) txn = g_malloc(sizeof(OstreeRepoAutoTransaction)); + g_assert (txn != NULL); txn->repo = self; - (void) txn; /* Add use to silence static analysis */ memset (&self->txn.stats, 0, sizeof (OstreeRepoTransactionStats)); diff --git a/src/libostree/ostree-repo-deprecated.h b/src/libostree/ostree-repo-deprecated.h index 1c9d2251..780c764c 100644 --- a/src/libostree/ostree-repo-deprecated.h +++ b/src/libostree/ostree-repo-deprecated.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #pragma once diff --git a/src/libostree/ostree-repo-file-enumerator.c b/src/libostree/ostree-repo-file-enumerator.c index 46d20ab1..a9ff5476 100644 --- a/src/libostree/ostree-repo-file-enumerator.c +++ b/src/libostree/ostree-repo-file-enumerator.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/libostree/ostree-repo-file-enumerator.h b/src/libostree/ostree-repo-file-enumerator.h index e93295b1..8404d24c 100644 --- a/src/libostree/ostree-repo-file-enumerator.h +++ b/src/libostree/ostree-repo-file-enumerator.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/libostree/ostree-repo-file.c b/src/libostree/ostree-repo-file.c index 7ad11529..082588a5 100644 --- a/src/libostree/ostree-repo-file.c +++ b/src/libostree/ostree-repo-file.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/libostree/ostree-repo-file.h b/src/libostree/ostree-repo-file.h index fd658909..bfe2ab04 100644 --- a/src/libostree/ostree-repo-file.h +++ b/src/libostree/ostree-repo-file.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/libostree/ostree-repo-finder-avahi-parser.c b/src/libostree/ostree-repo-finder-avahi-parser.c index 1cf4a11d..8eb1ce4c 100644 --- a/src/libostree/ostree-repo-finder-avahi-parser.c +++ b/src/libostree/ostree-repo-finder-avahi-parser.c @@ -15,9 +15,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Authors: * - Krzesimir Nowak diff --git a/src/libostree/ostree-repo-finder-avahi-private.h b/src/libostree/ostree-repo-finder-avahi-private.h index 5a960385..f44677eb 100644 --- a/src/libostree/ostree-repo-finder-avahi-private.h +++ b/src/libostree/ostree-repo-finder-avahi-private.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Authors: * - Philip Withnall diff --git a/src/libostree/ostree-repo-finder-avahi.c b/src/libostree/ostree-repo-finder-avahi.c index 1b085ea0..76153b01 100644 --- a/src/libostree/ostree-repo-finder-avahi.c +++ b/src/libostree/ostree-repo-finder-avahi.c @@ -15,9 +15,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Authors: * - Krzesimir Nowak diff --git a/src/libostree/ostree-repo-finder-avahi.h b/src/libostree/ostree-repo-finder-avahi.h index f79b68bd..92b15f22 100644 --- a/src/libostree/ostree-repo-finder-avahi.h +++ b/src/libostree/ostree-repo-finder-avahi.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Authors: * - Philip Withnall diff --git a/src/libostree/ostree-repo-finder-config.c b/src/libostree/ostree-repo-finder-config.c index 06f61657..9cee8a98 100644 --- a/src/libostree/ostree-repo-finder-config.c +++ b/src/libostree/ostree-repo-finder-config.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Authors: * - Philip Withnall diff --git a/src/libostree/ostree-repo-finder-config.h b/src/libostree/ostree-repo-finder-config.h index c5084321..2ba10418 100644 --- a/src/libostree/ostree-repo-finder-config.h +++ b/src/libostree/ostree-repo-finder-config.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Authors: * - Philip Withnall diff --git a/src/libostree/ostree-repo-finder-mount.c b/src/libostree/ostree-repo-finder-mount.c index 5c8ab1f3..628c53c0 100644 --- a/src/libostree/ostree-repo-finder-mount.c +++ b/src/libostree/ostree-repo-finder-mount.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Authors: * - Philip Withnall diff --git a/src/libostree/ostree-repo-finder-mount.h b/src/libostree/ostree-repo-finder-mount.h index 6c78135a..d0403388 100644 --- a/src/libostree/ostree-repo-finder-mount.h +++ b/src/libostree/ostree-repo-finder-mount.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Authors: * - Philip Withnall diff --git a/src/libostree/ostree-repo-finder-override.c b/src/libostree/ostree-repo-finder-override.c index d6fb5a9b..c2af9fc3 100644 --- a/src/libostree/ostree-repo-finder-override.c +++ b/src/libostree/ostree-repo-finder-override.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Authors: * - Philip Withnall diff --git a/src/libostree/ostree-repo-finder-override.h b/src/libostree/ostree-repo-finder-override.h index 8bce35eb..1e18a8f3 100644 --- a/src/libostree/ostree-repo-finder-override.h +++ b/src/libostree/ostree-repo-finder-override.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Authors: * - Philip Withnall diff --git a/src/libostree/ostree-repo-finder.c b/src/libostree/ostree-repo-finder.c index ed44ddca..aff6d6c5 100644 --- a/src/libostree/ostree-repo-finder.c +++ b/src/libostree/ostree-repo-finder.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Authors: * - Philip Withnall diff --git a/src/libostree/ostree-repo-finder.h b/src/libostree/ostree-repo-finder.h index f9c26199..0737b85e 100644 --- a/src/libostree/ostree-repo-finder.h +++ b/src/libostree/ostree-repo-finder.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Authors: * - Philip Withnall diff --git a/src/libostree/ostree-repo-libarchive.c b/src/libostree/ostree-repo-libarchive.c index 96b34c18..aacf7c64 100644 --- a/src/libostree/ostree-repo-libarchive.c +++ b/src/libostree/ostree-repo-libarchive.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/libostree/ostree-repo-os.c b/src/libostree/ostree-repo-os.c index 96beddda..784e0336 100644 --- a/src/libostree/ostree-repo-os.c +++ b/src/libostree/ostree-repo-os.c @@ -12,9 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/libostree/ostree-repo-os.h b/src/libostree/ostree-repo-os.h index b2443768..9019ea59 100644 --- a/src/libostree/ostree-repo-os.h +++ b/src/libostree/ostree-repo-os.h @@ -12,9 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #pragma once diff --git a/src/libostree/ostree-repo-private.h b/src/libostree/ostree-repo-private.h index daec289c..6d8f0193 100644 --- a/src/libostree/ostree-repo-private.h +++ b/src/libostree/ostree-repo-private.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #pragma once diff --git a/src/libostree/ostree-repo-prune.c b/src/libostree/ostree-repo-prune.c index 82fcf639..175765fd 100644 --- a/src/libostree/ostree-repo-prune.c +++ b/src/libostree/ostree-repo-prune.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/libostree/ostree-repo-pull-private.h b/src/libostree/ostree-repo-pull-private.h index 59b72e88..6ee7ba02 100644 --- a/src/libostree/ostree-repo-pull-private.h +++ b/src/libostree/ostree-repo-pull-private.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #pragma once diff --git a/src/libostree/ostree-repo-pull-verify.c b/src/libostree/ostree-repo-pull-verify.c index e469dc0b..8989d663 100644 --- a/src/libostree/ostree-repo-pull-verify.c +++ b/src/libostree/ostree-repo-pull-verify.c @@ -15,9 +15,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/libostree/ostree-repo-pull.c b/src/libostree/ostree-repo-pull.c index 6bb040a4..65b56789 100644 --- a/src/libostree/ostree-repo-pull.c +++ b/src/libostree/ostree-repo-pull.c @@ -15,9 +15,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Authors: * - Colin Walters diff --git a/src/libostree/ostree-repo-refs.c b/src/libostree/ostree-repo-refs.c index 2fb0f04e..8d010729 100644 --- a/src/libostree/ostree-repo-refs.c +++ b/src/libostree/ostree-repo-refs.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/libostree/ostree-repo-static-delta-compilation-analysis.c b/src/libostree/ostree-repo-static-delta-compilation-analysis.c index 53486c21..f92951eb 100644 --- a/src/libostree/ostree-repo-static-delta-compilation-analysis.c +++ b/src/libostree/ostree-repo-static-delta-compilation-analysis.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/libostree/ostree-repo-static-delta-compilation.c b/src/libostree/ostree-repo-static-delta-compilation.c index 0f0828f7..cf232c11 100644 --- a/src/libostree/ostree-repo-static-delta-compilation.c +++ b/src/libostree/ostree-repo-static-delta-compilation.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/libostree/ostree-repo-static-delta-core.c b/src/libostree/ostree-repo-static-delta-core.c index 084c20cd..7e6611da 100644 --- a/src/libostree/ostree-repo-static-delta-core.c +++ b/src/libostree/ostree-repo-static-delta-core.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/libostree/ostree-repo-static-delta-private.h b/src/libostree/ostree-repo-static-delta-private.h index d6c706da..ccc0ad0c 100644 --- a/src/libostree/ostree-repo-static-delta-private.h +++ b/src/libostree/ostree-repo-static-delta-private.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #pragma once diff --git a/src/libostree/ostree-repo-static-delta-processing.c b/src/libostree/ostree-repo-static-delta-processing.c index 7b5b9eb3..6e093121 100644 --- a/src/libostree/ostree-repo-static-delta-processing.c +++ b/src/libostree/ostree-repo-static-delta-processing.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" @@ -458,7 +456,7 @@ dispatch_bspatch (OstreeRepo *repo, buf, state->content_size, &stream) < 0) - return FALSE; + return glnx_throw (error, "bsdiff patch failed"); if (!_ostree_repo_bare_content_write (repo, &state->content_out, buf, state->content_size, diff --git a/src/libostree/ostree-repo-traverse.c b/src/libostree/ostree-repo-traverse.c index d0edd65d..c5c204d7 100644 --- a/src/libostree/ostree-repo-traverse.c +++ b/src/libostree/ostree-repo-traverse.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/libostree/ostree-repo-verity.c b/src/libostree/ostree-repo-verity.c index 92b026ee..d25d6934 100644 --- a/src/libostree/ostree-repo-verity.c +++ b/src/libostree/ostree-repo-verity.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c index 74cea37f..86948ee2 100644 --- a/src/libostree/ostree-repo.c +++ b/src/libostree/ostree-repo.c @@ -15,9 +15,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ @@ -1560,8 +1558,10 @@ gboolean ostree_repo_is_writable (OstreeRepo *self, GError **error) { - g_return_val_if_fail (self->inited, FALSE); + g_assert (self != NULL); + g_assert (self->inited); + g_assert (self->writable == (self->writable_error == NULL)); if (error != NULL && self->writable_error != NULL) *error = g_error_copy (self->writable_error); @@ -1597,7 +1597,8 @@ _ostree_repo_update_mtime (OstreeRepo *self, GKeyFile * ostree_repo_get_config (OstreeRepo *self) { - g_return_val_if_fail (self->inited, NULL); + g_assert (self != NULL); + g_assert (self->inited); return self->config; } @@ -1615,7 +1616,8 @@ ostree_repo_copy_config (OstreeRepo *self) char *data; gsize len; - g_return_val_if_fail (self->inited, NULL); + g_assert (self != NULL); + g_assert (self->inited); copy = g_key_file_new (); data = g_key_file_to_data (self->config, &len, NULL); @@ -3814,7 +3816,8 @@ ostree_repo_equal (OstreeRepo *a, OstreeRepoMode ostree_repo_get_mode (OstreeRepo *self) { - g_return_val_if_fail (self->inited, FALSE); + g_assert (self != NULL); + g_assert (self->inited); return self->mode; } @@ -6105,7 +6108,7 @@ summary_add_ref_entry (OstreeRepo *self, * and refs in %OSTREE_SUMMARY_COLLECTION_MAP are guaranteed to be in * lexicographic order. * - * Locking: exclusive + * Locking: shared (Prior to 2021.7, this was exclusive) */ gboolean ostree_repo_regenerate_summary (OstreeRepo *self, @@ -6113,16 +6116,10 @@ ostree_repo_regenerate_summary (OstreeRepo *self, GCancellable *cancellable, GError **error) { - /* Take an exclusive lock. This makes sure the commits and deltas don't get - * deleted while generating the summary. It also means we can be sure refs - * won't be created/updated/deleted during the operation, without having to - * add exclusive locks to those operations which would prevent concurrent - * commits from working. - */ g_autoptr(OstreeRepoAutoLock) lock = NULL; gboolean no_deltas_in_summary = FALSE; - lock = ostree_repo_auto_lock_push (self, OSTREE_REPO_LOCK_EXCLUSIVE, + lock = ostree_repo_auto_lock_push (self, OSTREE_REPO_LOCK_SHARED, cancellable, error); if (!lock) return FALSE; diff --git a/src/libostree/ostree-repo.h b/src/libostree/ostree-repo.h index 522cb034..8a5c3b33 100644 --- a/src/libostree/ostree-repo.h +++ b/src/libostree/ostree-repo.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/libostree/ostree-rollsum.c b/src/libostree/ostree-rollsum.c index 74033e34..805c156c 100644 --- a/src/libostree/ostree-rollsum.c +++ b/src/libostree/ostree-rollsum.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/libostree/ostree-rollsum.h b/src/libostree/ostree-rollsum.h index 6f8ca531..50016b3b 100644 --- a/src/libostree/ostree-rollsum.h +++ b/src/libostree/ostree-rollsum.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #pragma once diff --git a/src/libostree/ostree-sepolicy-private.h b/src/libostree/ostree-sepolicy-private.h index 980f2580..7bbc1a1b 100644 --- a/src/libostree/ostree-sepolicy-private.h +++ b/src/libostree/ostree-sepolicy-private.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #pragma once diff --git a/src/libostree/ostree-sepolicy.c b/src/libostree/ostree-sepolicy.c index 9b2ce0ab..d8ff35cb 100644 --- a/src/libostree/ostree-sepolicy.c +++ b/src/libostree/ostree-sepolicy.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/libostree/ostree-sepolicy.h b/src/libostree/ostree-sepolicy.h index 0e8cf5af..3534a530 100644 --- a/src/libostree/ostree-sepolicy.h +++ b/src/libostree/ostree-sepolicy.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #pragma once diff --git a/src/libostree/ostree-sign-dummy.c b/src/libostree/ostree-sign-dummy.c index 55f28f11..562413e8 100644 --- a/src/libostree/ostree-sign-dummy.c +++ b/src/libostree/ostree-sign-dummy.c @@ -16,9 +16,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * */ diff --git a/src/libostree/ostree-sign-dummy.h b/src/libostree/ostree-sign-dummy.h index bf5d63a1..3f4d7643 100644 --- a/src/libostree/ostree-sign-dummy.h +++ b/src/libostree/ostree-sign-dummy.h @@ -16,9 +16,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Authors: * - Denis Pynkin (d4s) diff --git a/src/libostree/ostree-sign-ed25519.c b/src/libostree/ostree-sign-ed25519.c index 1eaff6a7..809ffe87 100644 --- a/src/libostree/ostree-sign-ed25519.c +++ b/src/libostree/ostree-sign-ed25519.c @@ -15,9 +15,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Authors: * - Denis Pynkin (d4s) diff --git a/src/libostree/ostree-sign-ed25519.h b/src/libostree/ostree-sign-ed25519.h index 72152eab..ec5271d7 100644 --- a/src/libostree/ostree-sign-ed25519.h +++ b/src/libostree/ostree-sign-ed25519.h @@ -16,9 +16,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Authors: * - Denis Pynkin (d4s) diff --git a/src/libostree/ostree-sign.c b/src/libostree/ostree-sign.c index eeef96dd..16e5d0f1 100644 --- a/src/libostree/ostree-sign.c +++ b/src/libostree/ostree-sign.c @@ -16,9 +16,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * */ diff --git a/src/libostree/ostree-sign.h b/src/libostree/ostree-sign.h index 75dd4837..3a9bcc6a 100644 --- a/src/libostree/ostree-sign.h +++ b/src/libostree/ostree-sign.h @@ -16,9 +16,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Authors: * - Denis Pynkin (d4s) diff --git a/src/libostree/ostree-soup-uri.c b/src/libostree/ostree-soup-uri.c index ba14e5c6..bfc5dd1a 100644 --- a/src/libostree/ostree-soup-uri.c +++ b/src/libostree/ostree-soup-uri.c @@ -16,8 +16,6 @@ char *soup_uri_decoded_copy (const char *str, int length, int *decoded_length); char *soup_uri_to_string_internal (SoupURI *uri, gboolean just_path_and_query, gboolean force_port); -gboolean soup_uri_is_http (SoupURI *uri, char **aliases); -gboolean soup_uri_is_https (SoupURI *uri, char **aliases); /* OSTREECHANGE: import soup-misc's char helpers */ #define SOUP_CHAR_URI_PERCENT_ENCODED 0x01 @@ -1436,48 +1434,5 @@ soup_uri_host_equal (gconstpointer v1, gconstpointer v2) return g_ascii_strcasecmp (one->host, two->host) == 0; } -gboolean -soup_uri_is_http (SoupURI *uri, char **aliases) -{ - int i; - - if (uri->scheme == SOUP_URI_SCHEME_HTTP) - return TRUE; - else if (uri->scheme == SOUP_URI_SCHEME_HTTPS) - return FALSE; - else if (!aliases) - return FALSE; - - for (i = 0; aliases[i]; i++) { - if (uri->scheme == aliases[i]) - return TRUE; - } - - if (!aliases[1] && !strcmp (aliases[0], "*")) - return TRUE; - else - return FALSE; -} - -gboolean -soup_uri_is_https (SoupURI *uri, char **aliases) -{ - int i; - - if (uri->scheme == SOUP_URI_SCHEME_HTTPS) - return TRUE; - else if (uri->scheme == SOUP_URI_SCHEME_HTTP) - return FALSE; - else if (!aliases) - return FALSE; - - for (i = 0; aliases[i]; i++) { - if (uri->scheme == aliases[i]) - return TRUE; - } - - return FALSE; -} - /* OSTREECHANGE: drop boxed type definition */ /* G_DEFINE_BOXED_TYPE (SoupURI, soup_uri, soup_uri_copy, soup_uri_free) */ diff --git a/src/libostree/ostree-sysroot-cleanup.c b/src/libostree/ostree-sysroot-cleanup.c index c22a6851..3471cac7 100644 --- a/src/libostree/ostree-sysroot-cleanup.c +++ b/src/libostree/ostree-sysroot-cleanup.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c index a8bf9f44..c4ae86d5 100644 --- a/src/libostree/ostree-sysroot-deploy.c +++ b/src/libostree/ostree-sysroot-deploy.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/libostree/ostree-sysroot-private.h b/src/libostree/ostree-sysroot-private.h index bf3ecf32..9cc4023f 100644 --- a/src/libostree/ostree-sysroot-private.h +++ b/src/libostree/ostree-sysroot-private.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #pragma once diff --git a/src/libostree/ostree-sysroot-upgrader.c b/src/libostree/ostree-sysroot-upgrader.c index eefeda6e..0b2590ba 100644 --- a/src/libostree/ostree-sysroot-upgrader.c +++ b/src/libostree/ostree-sysroot-upgrader.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/libostree/ostree-sysroot-upgrader.h b/src/libostree/ostree-sysroot-upgrader.h index 10a463c5..b214157f 100644 --- a/src/libostree/ostree-sysroot-upgrader.h +++ b/src/libostree/ostree-sysroot-upgrader.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #pragma once diff --git a/src/libostree/ostree-sysroot.c b/src/libostree/ostree-sysroot.c index 04432cbc..eccf9375 100644 --- a/src/libostree/ostree-sysroot.c +++ b/src/libostree/ostree-sysroot.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/libostree/ostree-sysroot.h b/src/libostree/ostree-sysroot.h index 036b81e8..41361716 100644 --- a/src/libostree/ostree-sysroot.h +++ b/src/libostree/ostree-sysroot.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #pragma once diff --git a/src/libostree/ostree-types.h b/src/libostree/ostree-types.h index c6f9cba1..f3ba829c 100644 --- a/src/libostree/ostree-types.h +++ b/src/libostree/ostree-types.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/libostree/ostree-varint.c b/src/libostree/ostree-varint.c index 0acf21d1..26b5d46b 100644 --- a/src/libostree/ostree-varint.c +++ b/src/libostree/ostree-varint.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ /* Significant code derived from protobuf: */ diff --git a/src/libostree/ostree-varint.h b/src/libostree/ostree-varint.h index eac37f2e..db232210 100644 --- a/src/libostree/ostree-varint.h +++ b/src/libostree/ostree-varint.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #pragma once diff --git a/src/libostree/ostree-version.h b/src/libostree/ostree-version.h index 3a4c251d..40b5c95e 100644 --- a/src/libostree/ostree-version.h +++ b/src/libostree/ostree-version.h @@ -12,9 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * Public License along with this library. If not, see . */ #pragma once @@ -34,7 +32,7 @@ * * Since: 2017.4 */ -#define OSTREE_YEAR_VERSION (2021) +#define OSTREE_YEAR_VERSION (2022) /** * OSTREE_RELEASE_VERSION: @@ -43,7 +41,7 @@ * * Since: 2017.4 */ -#define OSTREE_RELEASE_VERSION (6) +#define OSTREE_RELEASE_VERSION (1) /** * OSTREE_VERSION @@ -52,7 +50,7 @@ * * Since: 2017.4 */ -#define OSTREE_VERSION (2021.6) +#define OSTREE_VERSION (2022.1) /** * OSTREE_VERSION_S: @@ -62,7 +60,7 @@ * * Since: 2017.4 */ -#define OSTREE_VERSION_S "2021.6" +#define OSTREE_VERSION_S "2022.1" #define OSTREE_ENCODE_VERSION(year,release) \ ((year) << 16 | (release)) diff --git a/src/libostree/ostree-version.h.in b/src/libostree/ostree-version.h.in index 2c7ecdec..c259b251 100644 --- a/src/libostree/ostree-version.h.in +++ b/src/libostree/ostree-version.h.in @@ -12,9 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * Public License along with this library. If not, see . */ #pragma once diff --git a/src/libostree/ostree.h b/src/libostree/ostree.h index e4847dbe..8422823e 100644 --- a/src/libostree/ostree.h +++ b/src/libostree/ostree.h @@ -14,14 +14,13 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #pragma once #include +#include #include #include #include diff --git a/src/libotutil/ot-checksum-instream.c b/src/libotutil/ot-checksum-instream.c index 7a704dba..6555eb8a 100644 --- a/src/libotutil/ot-checksum-instream.c +++ b/src/libotutil/ot-checksum-instream.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * Public License along with this library. If not, see . */ #include "config.h" diff --git a/src/libotutil/ot-checksum-instream.h b/src/libotutil/ot-checksum-instream.h index 3dcdff91..643e4962 100644 --- a/src/libotutil/ot-checksum-instream.h +++ b/src/libotutil/ot-checksum-instream.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * Public License along with this library. If not, see . * */ diff --git a/src/libotutil/ot-checksum-utils.c b/src/libotutil/ot-checksum-utils.c index 26e0280a..df573f2c 100644 --- a/src/libotutil/ot-checksum-utils.c +++ b/src/libotutil/ot-checksum-utils.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/libotutil/ot-checksum-utils.h b/src/libotutil/ot-checksum-utils.h index 5432c81e..d1be20bf 100644 --- a/src/libotutil/ot-checksum-utils.h +++ b/src/libotutil/ot-checksum-utils.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/libotutil/ot-fs-utils.c b/src/libotutil/ot-fs-utils.c index c4fcd56f..5439c959 100644 --- a/src/libotutil/ot-fs-utils.c +++ b/src/libotutil/ot-fs-utils.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/libotutil/ot-fs-utils.h b/src/libotutil/ot-fs-utils.h index 74a0fed6..fad4c53d 100644 --- a/src/libotutil/ot-fs-utils.h +++ b/src/libotutil/ot-fs-utils.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #pragma once diff --git a/src/libotutil/ot-gio-utils.c b/src/libotutil/ot-gio-utils.c index 9ee6f7d5..ef226020 100644 --- a/src/libotutil/ot-gio-utils.c +++ b/src/libotutil/ot-gio-utils.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/libotutil/ot-gio-utils.h b/src/libotutil/ot-gio-utils.h index d317ac29..27c1d2d9 100644 --- a/src/libotutil/ot-gio-utils.h +++ b/src/libotutil/ot-gio-utils.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/libotutil/ot-gpg-utils.c b/src/libotutil/ot-gpg-utils.c index 4dbefdbd..63d6e503 100644 --- a/src/libotutil/ot-gpg-utils.c +++ b/src/libotutil/ot-gpg-utils.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/libotutil/ot-gpg-utils.h b/src/libotutil/ot-gpg-utils.h index b559b695..ee1b1270 100644 --- a/src/libotutil/ot-gpg-utils.h +++ b/src/libotutil/ot-gpg-utils.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #pragma once diff --git a/src/libotutil/ot-keyfile-utils.c b/src/libotutil/ot-keyfile-utils.c index 3e028b20..de8abd2b 100644 --- a/src/libotutil/ot-keyfile-utils.c +++ b/src/libotutil/ot-keyfile-utils.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/libotutil/ot-keyfile-utils.h b/src/libotutil/ot-keyfile-utils.h index b16571df..3b4f6560 100644 --- a/src/libotutil/ot-keyfile-utils.h +++ b/src/libotutil/ot-keyfile-utils.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/libotutil/ot-opt-utils.c b/src/libotutil/ot-opt-utils.c index 5d55d8df..73ed8b5c 100644 --- a/src/libotutil/ot-opt-utils.c +++ b/src/libotutil/ot-opt-utils.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/libotutil/ot-opt-utils.h b/src/libotutil/ot-opt-utils.h index bac1b4e4..e6a9c3fc 100644 --- a/src/libotutil/ot-opt-utils.h +++ b/src/libotutil/ot-opt-utils.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/libotutil/ot-tool-util.c b/src/libotutil/ot-tool-util.c index 35e6a343..33e87663 100644 --- a/src/libotutil/ot-tool-util.c +++ b/src/libotutil/ot-tool-util.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/libotutil/ot-tool-util.h b/src/libotutil/ot-tool-util.h index 70f7d55d..be15c010 100644 --- a/src/libotutil/ot-tool-util.h +++ b/src/libotutil/ot-tool-util.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #pragma once diff --git a/src/libotutil/ot-unix-utils.c b/src/libotutil/ot-unix-utils.c index 17016ae1..58539864 100644 --- a/src/libotutil/ot-unix-utils.c +++ b/src/libotutil/ot-unix-utils.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/libotutil/ot-unix-utils.h b/src/libotutil/ot-unix-utils.h index 36e2f0a7..46fb49ad 100644 --- a/src/libotutil/ot-unix-utils.h +++ b/src/libotutil/ot-unix-utils.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/libotutil/ot-variant-builder.c b/src/libotutil/ot-variant-builder.c index e4347f39..92ac8ede 100644 --- a/src/libotutil/ot-variant-builder.c +++ b/src/libotutil/ot-variant-builder.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Alexander Larsson . */ diff --git a/src/libotutil/ot-variant-builder.h b/src/libotutil/ot-variant-builder.h index 8ea0a214..ed59eeea 100644 --- a/src/libotutil/ot-variant-builder.h +++ b/src/libotutil/ot-variant-builder.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Alexander Larsson . */ diff --git a/src/libotutil/ot-variant-utils.c b/src/libotutil/ot-variant-utils.c index fce3f53d..f6a4e43c 100644 --- a/src/libotutil/ot-variant-utils.c +++ b/src/libotutil/ot-variant-utils.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/libotutil/ot-variant-utils.h b/src/libotutil/ot-variant-utils.h index d1cd8b59..b12682ed 100644 --- a/src/libotutil/ot-variant-utils.h +++ b/src/libotutil/ot-variant-utils.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/libotutil/otutil.h b/src/libotutil/otutil.h index 4cc5cd9f..1b543062 100644 --- a/src/libotutil/otutil.h +++ b/src/libotutil/otutil.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/ostree/main.c b/src/ostree/main.c index a9f57392..7d17080c 100644 --- a/src/ostree/main.c +++ b/src/ostree/main.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ @@ -28,7 +26,6 @@ #include #include #include -#include #include "ot-main.h" #include "ot-builtins.h" @@ -133,22 +130,16 @@ int main (int argc, char **argv) { - g_autoptr(GError) error = NULL; - int ret; + g_assert (argc > 0); - setlocale (LC_ALL, ""); - - g_set_prgname (argv[0]); - - ret = ostree_run (argc, argv, commands, &error); - - if (error != NULL) + g_autofree gchar *ext_command = ostree_command_lookup_external (argc, argv, commands); + if (ext_command != NULL) { - g_printerr ("%s%serror:%s%s %s\n", - ot_get_red_start (), ot_get_bold_start (), - ot_get_bold_end (), ot_get_red_end (), - error->message); + argv[0] = ext_command; + return ostree_command_exec_external (argv); + } + else + { + return ostree_main (argc, argv, commands); } - - return ret; } diff --git a/src/ostree/ostree-trivial-httpd.c b/src/ostree/ostree-trivial-httpd.c index d8bc0556..6f038e9e 100644 --- a/src/ostree/ostree-trivial-httpd.c +++ b/src/ostree/ostree-trivial-httpd.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/ostree/ot-admin-builtin-cleanup.c b/src/ostree/ot-admin-builtin-cleanup.c index 875d6fa3..94d3224c 100644 --- a/src/ostree/ot-admin-builtin-cleanup.c +++ b/src/ostree/ot-admin-builtin-cleanup.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/ostree/ot-admin-builtin-deploy.c b/src/ostree/ot-admin-builtin-deploy.c index 8156cc15..97351b14 100644 --- a/src/ostree/ot-admin-builtin-deploy.c +++ b/src/ostree/ot-admin-builtin-deploy.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/ostree/ot-admin-builtin-diff.c b/src/ostree/ot-admin-builtin-diff.c index 27855881..167ec420 100644 --- a/src/ostree/ot-admin-builtin-diff.c +++ b/src/ostree/ot-admin-builtin-diff.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/ostree/ot-admin-builtin-finalize-staged.c b/src/ostree/ot-admin-builtin-finalize-staged.c index 3cea1bdb..80d8a9b7 100644 --- a/src/ostree/ot-admin-builtin-finalize-staged.c +++ b/src/ostree/ot-admin-builtin-finalize-staged.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/ostree/ot-admin-builtin-init-fs.c b/src/ostree/ot-admin-builtin-init-fs.c index cb1e1b69..87f46cb9 100644 --- a/src/ostree/ot-admin-builtin-init-fs.c +++ b/src/ostree/ot-admin-builtin-init-fs.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/ostree/ot-admin-builtin-instutil.c b/src/ostree/ot-admin-builtin-instutil.c index fe0d80a4..b946a96b 100644 --- a/src/ostree/ot-admin-builtin-instutil.c +++ b/src/ostree/ot-admin-builtin-instutil.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/ostree/ot-admin-builtin-os-init.c b/src/ostree/ot-admin-builtin-os-init.c index 203f297b..cb1ec66d 100644 --- a/src/ostree/ot-admin-builtin-os-init.c +++ b/src/ostree/ot-admin-builtin-os-init.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/ostree/ot-admin-builtin-pin.c b/src/ostree/ot-admin-builtin-pin.c index 5269dd8c..301e1aab 100644 --- a/src/ostree/ot-admin-builtin-pin.c +++ b/src/ostree/ot-admin-builtin-pin.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/ostree/ot-admin-builtin-set-origin.c b/src/ostree/ot-admin-builtin-set-origin.c index b133dc58..1a6bf2e8 100644 --- a/src/ostree/ot-admin-builtin-set-origin.c +++ b/src/ostree/ot-admin-builtin-set-origin.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/ostree/ot-admin-builtin-status.c b/src/ostree/ot-admin-builtin-status.c index 8b2325d5..af1a711c 100644 --- a/src/ostree/ot-admin-builtin-status.c +++ b/src/ostree/ot-admin-builtin-status.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/ostree/ot-admin-builtin-switch.c b/src/ostree/ot-admin-builtin-switch.c index b94be767..d29e7039 100644 --- a/src/ostree/ot-admin-builtin-switch.c +++ b/src/ostree/ot-admin-builtin-switch.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/ostree/ot-admin-builtin-undeploy.c b/src/ostree/ot-admin-builtin-undeploy.c index 0a50dc0d..41155689 100644 --- a/src/ostree/ot-admin-builtin-undeploy.c +++ b/src/ostree/ot-admin-builtin-undeploy.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/ostree/ot-admin-builtin-unlock.c b/src/ostree/ot-admin-builtin-unlock.c index 77fe8be3..800c0744 100644 --- a/src/ostree/ot-admin-builtin-unlock.c +++ b/src/ostree/ot-admin-builtin-unlock.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/ostree/ot-admin-builtin-upgrade.c b/src/ostree/ot-admin-builtin-upgrade.c index 2c0149c1..3ed71efb 100644 --- a/src/ostree/ot-admin-builtin-upgrade.c +++ b/src/ostree/ot-admin-builtin-upgrade.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/ostree/ot-admin-builtins.h b/src/ostree/ot-admin-builtins.h index d88fc0b9..d32b617e 100644 --- a/src/ostree/ot-admin-builtins.h +++ b/src/ostree/ot-admin-builtins.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/ostree/ot-admin-functions.c b/src/ostree/ot-admin-functions.c index d52836e4..e2309f6e 100644 --- a/src/ostree/ot-admin-functions.c +++ b/src/ostree/ot-admin-functions.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/ostree/ot-admin-functions.h b/src/ostree/ot-admin-functions.h index 21e55ae8..f2cbc0be 100644 --- a/src/ostree/ot-admin-functions.h +++ b/src/ostree/ot-admin-functions.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/ostree/ot-admin-instutil-builtin-grub2-generate.c b/src/ostree/ot-admin-instutil-builtin-grub2-generate.c index 3ab5c245..af3fa671 100644 --- a/src/ostree/ot-admin-instutil-builtin-grub2-generate.c +++ b/src/ostree/ot-admin-instutil-builtin-grub2-generate.c @@ -12,9 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * Public License along with this library. If not, see . */ #include "config.h" diff --git a/src/ostree/ot-admin-instutil-builtin-selinux-ensure-labeled.c b/src/ostree/ot-admin-instutil-builtin-selinux-ensure-labeled.c index 8bf75b31..017ae5cb 100644 --- a/src/ostree/ot-admin-instutil-builtin-selinux-ensure-labeled.c +++ b/src/ostree/ot-admin-instutil-builtin-selinux-ensure-labeled.c @@ -12,9 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * Public License along with this library. If not, see . */ #include "config.h" diff --git a/src/ostree/ot-admin-instutil-builtin-set-kargs.c b/src/ostree/ot-admin-instutil-builtin-set-kargs.c index fb5c7d2d..ff773c3b 100644 --- a/src/ostree/ot-admin-instutil-builtin-set-kargs.c +++ b/src/ostree/ot-admin-instutil-builtin-set-kargs.c @@ -12,9 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * Public License along with this library. If not, see . */ #include "config.h" diff --git a/src/ostree/ot-admin-instutil-builtins.h b/src/ostree/ot-admin-instutil-builtins.h index b0ab9e47..03a0bb69 100644 --- a/src/ostree/ot-admin-instutil-builtins.h +++ b/src/ostree/ot-admin-instutil-builtins.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #pragma once diff --git a/src/ostree/ot-builtin-admin.c b/src/ostree/ot-builtin-admin.c index 834a271b..e0d2a60c 100644 --- a/src/ostree/ot-builtin-admin.c +++ b/src/ostree/ot-builtin-admin.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/ostree/ot-builtin-cat.c b/src/ostree/ot-builtin-cat.c index 53257055..6d9736ea 100644 --- a/src/ostree/ot-builtin-cat.c +++ b/src/ostree/ot-builtin-cat.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/ostree/ot-builtin-checkout.c b/src/ostree/ot-builtin-checkout.c index ed9ee1e5..d69c8b0b 100644 --- a/src/ostree/ot-builtin-checkout.c +++ b/src/ostree/ot-builtin-checkout.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/ostree/ot-builtin-checksum.c b/src/ostree/ot-builtin-checksum.c index 354fa2e2..576fbfde 100644 --- a/src/ostree/ot-builtin-checksum.c +++ b/src/ostree/ot-builtin-checksum.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/ostree/ot-builtin-commit.c b/src/ostree/ot-builtin-commit.c index a306c114..845013ed 100644 --- a/src/ostree/ot-builtin-commit.c +++ b/src/ostree/ot-builtin-commit.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/ostree/ot-builtin-config.c b/src/ostree/ot-builtin-config.c index 64e434aa..3c160492 100644 --- a/src/ostree/ot-builtin-config.c +++ b/src/ostree/ot-builtin-config.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/ostree/ot-builtin-create-usb.c b/src/ostree/ot-builtin-create-usb.c index 849684f6..6bd5f2ad 100644 --- a/src/ostree/ot-builtin-create-usb.c +++ b/src/ostree/ot-builtin-create-usb.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Authors: * - Philip Withnall diff --git a/src/ostree/ot-builtin-diff.c b/src/ostree/ot-builtin-diff.c index 82a533d5..eecc471b 100644 --- a/src/ostree/ot-builtin-diff.c +++ b/src/ostree/ot-builtin-diff.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/ostree/ot-builtin-export.c b/src/ostree/ot-builtin-export.c index 0f0755ea..bcf7da56 100644 --- a/src/ostree/ot-builtin-export.c +++ b/src/ostree/ot-builtin-export.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/ostree/ot-builtin-find-remotes.c b/src/ostree/ot-builtin-find-remotes.c index 944533ca..03ab1bef 100644 --- a/src/ostree/ot-builtin-find-remotes.c +++ b/src/ostree/ot-builtin-find-remotes.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Authors: * - Philip Withnall diff --git a/src/ostree/ot-builtin-fsck.c b/src/ostree/ot-builtin-fsck.c index f7a72601..8e3266a1 100644 --- a/src/ostree/ot-builtin-fsck.c +++ b/src/ostree/ot-builtin-fsck.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/ostree/ot-builtin-gpg-sign.c b/src/ostree/ot-builtin-gpg-sign.c index bde9180a..bfb1d902 100644 --- a/src/ostree/ot-builtin-gpg-sign.c +++ b/src/ostree/ot-builtin-gpg-sign.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/ostree/ot-builtin-init.c b/src/ostree/ot-builtin-init.c index 217bf310..a699a55a 100644 --- a/src/ostree/ot-builtin-init.c +++ b/src/ostree/ot-builtin-init.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/ostree/ot-builtin-log.c b/src/ostree/ot-builtin-log.c index 0a1d408b..c75656df 100644 --- a/src/ostree/ot-builtin-log.c +++ b/src/ostree/ot-builtin-log.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Stef Walter */ diff --git a/src/ostree/ot-builtin-ls.c b/src/ostree/ot-builtin-ls.c index baede0d6..a8056a86 100644 --- a/src/ostree/ot-builtin-ls.c +++ b/src/ostree/ot-builtin-ls.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/ostree/ot-builtin-prune.c b/src/ostree/ot-builtin-prune.c index fd2ab05f..d133bbd8 100644 --- a/src/ostree/ot-builtin-prune.c +++ b/src/ostree/ot-builtin-prune.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/ostree/ot-builtin-pull-local.c b/src/ostree/ot-builtin-pull-local.c index 1485b7d4..c39930af 100644 --- a/src/ostree/ot-builtin-pull-local.c +++ b/src/ostree/ot-builtin-pull-local.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/ostree/ot-builtin-pull.c b/src/ostree/ot-builtin-pull.c index df3a8d39..61f408eb 100644 --- a/src/ostree/ot-builtin-pull.c +++ b/src/ostree/ot-builtin-pull.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/ostree/ot-builtin-refs.c b/src/ostree/ot-builtin-refs.c index 1e0b1011..c687a5ff 100644 --- a/src/ostree/ot-builtin-refs.c +++ b/src/ostree/ot-builtin-refs.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/ostree/ot-builtin-remote.c b/src/ostree/ot-builtin-remote.c index 3c0d9d2e..0e14bb16 100644 --- a/src/ostree/ot-builtin-remote.c +++ b/src/ostree/ot-builtin-remote.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/ostree/ot-builtin-reset.c b/src/ostree/ot-builtin-reset.c index 2e25cb9c..591eed12 100644 --- a/src/ostree/ot-builtin-reset.c +++ b/src/ostree/ot-builtin-reset.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Stef Walter */ diff --git a/src/ostree/ot-builtin-rev-parse.c b/src/ostree/ot-builtin-rev-parse.c index 0f2c2ce3..c4a7ec94 100644 --- a/src/ostree/ot-builtin-rev-parse.c +++ b/src/ostree/ot-builtin-rev-parse.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/ostree/ot-builtin-show.c b/src/ostree/ot-builtin-show.c index 96e2d4c6..55f2b47e 100644 --- a/src/ostree/ot-builtin-show.c +++ b/src/ostree/ot-builtin-show.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/ostree/ot-builtin-sign.c b/src/ostree/ot-builtin-sign.c index 2f90acd1..f4e5c0e5 100644 --- a/src/ostree/ot-builtin-sign.c +++ b/src/ostree/ot-builtin-sign.c @@ -17,9 +17,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/ostree/ot-builtin-static-delta.c b/src/ostree/ot-builtin-static-delta.c index 0ce3cefb..99faf861 100644 --- a/src/ostree/ot-builtin-static-delta.c +++ b/src/ostree/ot-builtin-static-delta.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/ostree/ot-builtin-summary.c b/src/ostree/ot-builtin-summary.c index 0938f11e..2d6306a4 100644 --- a/src/ostree/ot-builtin-summary.c +++ b/src/ostree/ot-builtin-summary.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/ostree/ot-builtin-trivial-httpd.c b/src/ostree/ot-builtin-trivial-httpd.c index b187754f..71c286b3 100644 --- a/src/ostree/ot-builtin-trivial-httpd.c +++ b/src/ostree/ot-builtin-trivial-httpd.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/ostree/ot-builtins.h b/src/ostree/ot-builtins.h index e372d359..286c2e99 100644 --- a/src/ostree/ot-builtins.h +++ b/src/ostree/ot-builtins.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/ostree/ot-dump.c b/src/ostree/ot-dump.c index 45ebcfe2..b874db0f 100644 --- a/src/ostree/ot-dump.c +++ b/src/ostree/ot-dump.c @@ -15,9 +15,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Stef Walter * Colin Walters diff --git a/src/ostree/ot-dump.h b/src/ostree/ot-dump.h index 02e2f1a6..217a3964 100644 --- a/src/ostree/ot-dump.h +++ b/src/ostree/ot-dump.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Stef Walter */ diff --git a/src/ostree/ot-editor.c b/src/ostree/ot-editor.c index 6aa57130..f6e8e6a6 100644 --- a/src/ostree/ot-editor.c +++ b/src/ostree/ot-editor.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Stef Walter */ diff --git a/src/ostree/ot-editor.h b/src/ostree/ot-editor.h index a5615f7f..c096bed4 100644 --- a/src/ostree/ot-editor.h +++ b/src/ostree/ot-editor.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Stef Walter */ diff --git a/src/ostree/ot-main.c b/src/ostree/ot-main.c index 849a74ef..8ee73038 100644 --- a/src/ostree/ot-main.c +++ b/src/ostree/ot-main.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ @@ -25,6 +23,7 @@ #include +#include #include #include #include @@ -142,6 +141,102 @@ message_handler (const gchar *log_domain, g_printerr ("%s: %s\n", g_get_prgname (), message); } +int +ostree_main (int argc, + char **argv, + OstreeCommand *commands) +{ + g_autoptr(GError) error = NULL; + + setlocale (LC_ALL, ""); + + g_set_prgname (argv[0]); + + int ret = ostree_run (argc, argv, commands, &error); + + if (error != NULL) + { + g_printerr ("%s%serror:%s%s %s\n", + ot_get_red_start (), ot_get_bold_start (), + ot_get_bold_end (), ot_get_red_end (), + error->message); + } + + return ret; +} + + +/** + * ostree_command_lookup_external: + * @argc: number of entries in @argv + * @argv: array of command-line arguments + * @commands: array of hardcoded internal commands + * + * Search for a relevant ostree extension binary in $PATH. Given a verb + * from argv, if it is not an internal command, it tries to locate a + * corresponding 'ostree-$verb' executable on the system. + * + * Returns: (transfer full) (nullable): callname (i.e. argv[0]) for the + * external command if found, or %NULL otherwise. + */ +gchar * +ostree_command_lookup_external (int argc, + char **argv, + OstreeCommand *commands) +{ + g_assert (commands != NULL); + + // Find the first verb (ignoring all earlier flags), then + // check if it is a known native command. Otherwise, try to look it + // up in $PATH. + // We ignore argv[0] here, the ostree binary itself is not multicall. + for (guint arg_index = 1; arg_index < argc; arg_index++) + { + char *current_arg = argv[arg_index]; + if (current_arg == NULL || + g_str_has_prefix (current_arg, "-") || + g_strcmp0 (current_arg, "") == 0) + continue; + + for (guint cmd_index = 0; commands[cmd_index].name != NULL; cmd_index++) + { + if (g_strcmp0 (current_arg, (commands[cmd_index]).name) == 0) + return NULL; + } + + g_autofree gchar *ext_command = g_strdup_printf ("ostree-%s", current_arg); + if (g_find_program_in_path (ext_command) == NULL) + return NULL; + + return g_steal_pointer (&ext_command); + } + + return NULL; +} + +/** + * ostree_command_exec_external: + * @argv: array of command-line arguments + * + * Execute an ostree extension binary. + * + * Returns: diverge on proper execution, otherwise return 1. + */ +int +ostree_command_exec_external (char **argv) +{ + int r = execvp(argv[0], argv); + g_assert (r == -1); + + setlocale (LC_ALL, ""); + g_printerr ("%s%serror:%s%s: Executing %s: %s\n", + ot_get_red_start (), ot_get_bold_start (), + ot_get_bold_end (), ot_get_red_end (), + argv[0], + g_strerror (errno)); + return 1; +} + int ostree_run (int argc, char **argv, diff --git a/src/ostree/ot-main.h b/src/ostree/ot-main.h index b1b994b6..b369deb8 100644 --- a/src/ostree/ot-main.h +++ b/src/ostree/ot-main.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ @@ -60,10 +58,16 @@ struct OstreeCommandInvocation { OstreeCommand *command; }; +int ostree_main (int argc, char **argv, OstreeCommand *commands); + int ostree_run (int argc, char **argv, OstreeCommand *commands, GError **error); int ostree_usage (OstreeCommand *commands, gboolean is_error); +char* ostree_command_lookup_external (int argc, char **argv, OstreeCommand *commands); + +int ostree_command_exec_external (char **argv); + gboolean ostree_parse_sysroot_or_repo_option (GOptionContext *context, const char *sysroot_path, const char *repo_path, diff --git a/src/ostree/ot-remote-builtin-add-cookie.c b/src/ostree/ot-remote-builtin-add-cookie.c index 0b2647f6..30aeacb3 100644 --- a/src/ostree/ot-remote-builtin-add-cookie.c +++ b/src/ostree/ot-remote-builtin-add-cookie.c @@ -15,9 +15,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/ostree/ot-remote-builtin-add.c b/src/ostree/ot-remote-builtin-add.c index b08153ec..f07005f6 100644 --- a/src/ostree/ot-remote-builtin-add.c +++ b/src/ostree/ot-remote-builtin-add.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/ostree/ot-remote-builtin-delete-cookie.c b/src/ostree/ot-remote-builtin-delete-cookie.c index 441e4503..0c22caa2 100644 --- a/src/ostree/ot-remote-builtin-delete-cookie.c +++ b/src/ostree/ot-remote-builtin-delete-cookie.c @@ -15,9 +15,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/ostree/ot-remote-builtin-delete.c b/src/ostree/ot-remote-builtin-delete.c index ff38b0d7..eb60783c 100644 --- a/src/ostree/ot-remote-builtin-delete.c +++ b/src/ostree/ot-remote-builtin-delete.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/ostree/ot-remote-builtin-gpg-import.c b/src/ostree/ot-remote-builtin-gpg-import.c index 83bb19d4..ba4aa3b4 100644 --- a/src/ostree/ot-remote-builtin-gpg-import.c +++ b/src/ostree/ot-remote-builtin-gpg-import.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/ostree/ot-remote-builtin-gpg-list-keys.c b/src/ostree/ot-remote-builtin-gpg-list-keys.c index 84d0f1a3..d0a388ee 100644 --- a/src/ostree/ot-remote-builtin-gpg-list-keys.c +++ b/src/ostree/ot-remote-builtin-gpg-list-keys.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/ostree/ot-remote-builtin-list-cookies.c b/src/ostree/ot-remote-builtin-list-cookies.c index 549deeec..04e7573b 100644 --- a/src/ostree/ot-remote-builtin-list-cookies.c +++ b/src/ostree/ot-remote-builtin-list-cookies.c @@ -15,9 +15,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/ostree/ot-remote-builtin-list.c b/src/ostree/ot-remote-builtin-list.c index 51c78a17..552e5359 100644 --- a/src/ostree/ot-remote-builtin-list.c +++ b/src/ostree/ot-remote-builtin-list.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/ostree/ot-remote-builtin-refs.c b/src/ostree/ot-remote-builtin-refs.c index e4c1d104..d778fe60 100644 --- a/src/ostree/ot-remote-builtin-refs.c +++ b/src/ostree/ot-remote-builtin-refs.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/ostree/ot-remote-builtin-show-url.c b/src/ostree/ot-remote-builtin-show-url.c index 289c744b..f63908a9 100644 --- a/src/ostree/ot-remote-builtin-show-url.c +++ b/src/ostree/ot-remote-builtin-show-url.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/ostree/ot-remote-builtin-summary.c b/src/ostree/ot-remote-builtin-summary.c index bd4d026d..fb2c45a3 100644 --- a/src/ostree/ot-remote-builtin-summary.c +++ b/src/ostree/ot-remote-builtin-summary.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/ostree/ot-remote-builtins.h b/src/ostree/ot-remote-builtins.h index 4b46af19..4a0482a7 100644 --- a/src/ostree/ot-remote-builtins.h +++ b/src/ostree/ot-remote-builtins.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #pragma once diff --git a/src/ostree/ot-remote-cookie-util.c b/src/ostree/ot-remote-cookie-util.c index f65a4b68..8cf1eb07 100644 --- a/src/ostree/ot-remote-cookie-util.c +++ b/src/ostree/ot-remote-cookie-util.c @@ -15,9 +15,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/src/ostree/ot-remote-cookie-util.h b/src/ostree/ot-remote-cookie-util.h index a14f9d08..838714f6 100644 --- a/src/ostree/ot-remote-cookie-util.h +++ b/src/ostree/ot-remote-cookie-util.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #pragma once diff --git a/src/rofiles-fuse/Makefile-inc.am b/src/rofiles-fuse/Makefile-inc.am index 0cc1d9ea..17e1632c 100644 --- a/src/rofiles-fuse/Makefile-inc.am +++ b/src/rofiles-fuse/Makefile-inc.am @@ -13,9 +13,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . bin_PROGRAMS += rofiles-fuse diff --git a/src/rofiles-fuse/main.c b/src/rofiles-fuse/main.c index 7ace1af0..7f49dd88 100644 --- a/src/rofiles-fuse/main.c +++ b/src/rofiles-fuse/main.c @@ -14,12 +14,14 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ -#define FUSE_USE_VERSION 26 +#include "config.h" + +#ifndef FUSE_USE_VERSION +#error config.h needs to define FUSE_USE_VERSION +#endif #include #include @@ -57,7 +59,11 @@ ENSURE_RELPATH (const char *path) } static int +#if FUSE_USE_VERSION >= 31 +callback_getattr (const char *path, struct stat *st_data, struct fuse_file_info *finfo) +#else callback_getattr (const char *path, struct stat *st_data) +#endif { path = ENSURE_RELPATH (path); if (!*path) @@ -91,8 +97,13 @@ callback_readlink (const char *path, char *buf, size_t size) } static int +#if FUSE_USE_VERSION >= 31 +callback_readdir (const char *path, void *buf, fuse_fill_dir_t filler, + off_t offset, struct fuse_file_info *fi, enum fuse_readdir_flags flags) +#else callback_readdir (const char *path, void *buf, fuse_fill_dir_t filler, off_t offset, struct fuse_file_info *fi) +#endif { DIR *dp; struct dirent *de; @@ -125,8 +136,14 @@ callback_readdir (const char *path, void *buf, fuse_fill_dir_t filler, memset (&st, 0, sizeof (st)); st.st_ino = de->d_ino; st.st_mode = de->d_type << 12; + +#if FUSE_USE_VERSION >= 31 + if (filler (buf, de->d_name, &st, 0, 0)) + break; +#else if (filler (buf, de->d_name, &st, 0)) break; +#endif } (void) closedir (dp); @@ -186,11 +203,21 @@ callback_symlink (const char *from, const char *to) } static int +#if FUSE_USE_VERSION >= 31 +callback_rename (const char *from, const char *to, unsigned int flags) +#else callback_rename (const char *from, const char *to) +#endif { +#if FUSE_USE_VERSION < 31 + unsigned int flags = 0; +#endif + from = ENSURE_RELPATH (from); to = ENSURE_RELPATH (to); - if (renameat (basefd, from, basefd, to) == -1) + + /* This assumes Linux 3.15+ */ + if (renameat2 (basefd, from, basefd, to, flags) == -1) return -errno; return 0; } @@ -301,7 +328,11 @@ verify_write_or_copyup (const char *path, const struct stat *stbuf, } while (0) static int +#if FUSE_USE_VERSION >= 31 +callback_chmod (const char *path, mode_t mode, struct fuse_file_info *finfo) +#else callback_chmod (const char *path, mode_t mode) +#endif { PATH_WRITE_ENTRYPOINT (path); @@ -315,7 +346,11 @@ callback_chmod (const char *path, mode_t mode) } static int +#if FUSE_USE_VERSION >= 31 +callback_chown (const char *path, uid_t uid, gid_t gid, struct fuse_file_info *finfo) +#else callback_chown (const char *path, uid_t uid, gid_t gid) +#endif { PATH_WRITE_ENTRYPOINT (path); @@ -325,7 +360,11 @@ callback_chown (const char *path, uid_t uid, gid_t gid) } static int +#if FUSE_USE_VERSION >= 31 +callback_truncate (const char *path, off_t size, struct fuse_file_info *finfo) +#else callback_truncate (const char *path, off_t size) +#endif { PATH_WRITE_ENTRYPOINT (path); @@ -340,7 +379,11 @@ callback_truncate (const char *path, off_t size) } static int +#if FUSE_USE_VERSION >= 31 +callback_utimens (const char *path, const struct timespec tv[2], struct fuse_file_info *finfo) +#else callback_utimens (const char *path, const struct timespec tv[2]) +#endif { /* This one isn't write-verified, we support changing times * even for hardlinked files. diff --git a/src/switchroot/ostree-mount-util.h b/src/switchroot/ostree-mount-util.h index fb2d02b4..92bc8027 100644 --- a/src/switchroot/ostree-mount-util.h +++ b/src/switchroot/ostree-mount-util.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * */ diff --git a/src/switchroot/ostree-prepare-root.c b/src/switchroot/ostree-prepare-root.c index f48fc528..a5fbc8a8 100644 --- a/src/switchroot/ostree-prepare-root.c +++ b/src/switchroot/ostree-prepare-root.c @@ -24,9 +24,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ /* The high level goal of ostree-prepare-root.service is to run inside diff --git a/src/switchroot/ostree-remount.c b/src/switchroot/ostree-remount.c index 3981682a..4044b5ac 100644 --- a/src/switchroot/ostree-remount.c +++ b/src/switchroot/ostree-remount.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/src/switchroot/ostree-system-generator.c b/src/switchroot/ostree-system-generator.c index 78bca7c4..4b42176f 100644 --- a/src/switchroot/ostree-system-generator.c +++ b/src/switchroot/ostree-system-generator.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/tests/admin-test.sh b/tests/admin-test.sh index dd5ffd14..366dece1 100644 --- a/tests/admin-test.sh +++ b/tests/admin-test.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/archive-test.sh b/tests/archive-test.sh index 1e63a35b..b6d84979 100644 --- a/tests/archive-test.sh +++ b/tests/archive-test.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/basic-test.sh b/tests/basic-test.sh index 850a7605..04506c3d 100644 --- a/tests/basic-test.sh +++ b/tests/basic-test.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/bootloader-entries-crosscheck.py b/tests/bootloader-entries-crosscheck.py index b5a02066..7b3a0d53 100755 --- a/tests/bootloader-entries-crosscheck.py +++ b/tests/bootloader-entries-crosscheck.py @@ -13,9 +13,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . import os import sys diff --git a/tests/corrupt-repo-ref.js b/tests/corrupt-repo-ref.js index 3af8f670..207bd98c 100755 --- a/tests/corrupt-repo-ref.js +++ b/tests/corrupt-repo-ref.js @@ -15,9 +15,7 @@ // Lesser General Public License for more details. // // You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the -// Free Software Foundation, Inc., 59 Temple Place - Suite 330, -// Boston, MA 02111-1307, USA. +// License along with this library. If not, see . const GLib = imports.gi.GLib; const Gio = imports.gi.Gio; diff --git a/tests/libostreetest.c b/tests/libostreetest.c index 1efee40e..d5671a1e 100644 --- a/tests/libostreetest.c +++ b/tests/libostreetest.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" @@ -33,12 +31,14 @@ gboolean ot_test_run_libtest (const char *cmd, GError **error) { const char *srcdir = g_getenv ("G_TEST_SRCDIR"); - g_autoptr(GPtrArray) argv = g_ptr_array_new (); - g_autoptr(GString) cmdstr = g_string_new (""); + g_assert (srcdir != NULL); + g_assert (cmd != NULL); + g_autoptr(GPtrArray) argv = g_ptr_array_new (); g_ptr_array_add (argv, "bash"); g_ptr_array_add (argv, "-c"); + g_autoptr(GString) cmdstr = g_string_new (""); g_string_append (cmdstr, "set -xeuo pipefail; . "); g_string_append (cmdstr, srcdir); g_string_append (cmdstr, "/tests/libtest.sh; "); diff --git a/tests/libostreetest.h b/tests/libostreetest.h index d1bd61f3..aacfe5ef 100644 --- a/tests/libostreetest.h +++ b/tests/libostreetest.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Author: Colin Walters */ diff --git a/tests/libtest-core.sh b/tests/libtest-core.sh index 75b9063a..d10aac1c 100644 --- a/tests/libtest-core.sh +++ b/tests/libtest-core.sh @@ -23,9 +23,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . fatal() { echo $@ 1>&2; exit 1 diff --git a/tests/libtest.sh b/tests/libtest.sh index 3976bc5b..686f08dc 100755 --- a/tests/libtest.sh +++ b/tests/libtest.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . dn=$(dirname $0) diff --git a/tests/pull-test.sh b/tests/pull-test.sh index 7d363f47..f4084290 100644 --- a/tests/pull-test.sh +++ b/tests/pull-test.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/pull-test2.sh b/tests/pull-test2.sh index a0b699ae..a5e4aa04 100644 --- a/tests/pull-test2.sh +++ b/tests/pull-test2.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/readdir-rand.c b/tests/readdir-rand.c index 64a76516..f5d31ffb 100644 --- a/tests/readdir-rand.c +++ b/tests/readdir-rand.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/tests/repo-finder-mount.c b/tests/repo-finder-mount.c index 3d068af7..184148cc 100644 --- a/tests/repo-finder-mount.c +++ b/tests/repo-finder-mount.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Authors: * - Philip Withnall diff --git a/tests/test-admin-deploy-2.sh b/tests/test-admin-deploy-2.sh index 33c38988..23645ded 100755 --- a/tests/test-admin-deploy-2.sh +++ b/tests/test-admin-deploy-2.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-admin-deploy-bootid-gc.sh b/tests/test-admin-deploy-bootid-gc.sh index 051dae6d..9fda9d46 100755 --- a/tests/test-admin-deploy-bootid-gc.sh +++ b/tests/test-admin-deploy-bootid-gc.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-admin-deploy-clean.sh b/tests/test-admin-deploy-clean.sh index f26eaa0c..5c6c0413 100755 --- a/tests/test-admin-deploy-clean.sh +++ b/tests/test-admin-deploy-clean.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-admin-deploy-etcmerge-cornercases.sh b/tests/test-admin-deploy-etcmerge-cornercases.sh index ef4ddeec..6387dfab 100755 --- a/tests/test-admin-deploy-etcmerge-cornercases.sh +++ b/tests/test-admin-deploy-etcmerge-cornercases.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-admin-deploy-grub2.sh b/tests/test-admin-deploy-grub2.sh index 231aa2f8..e552cb20 100755 --- a/tests/test-admin-deploy-grub2.sh +++ b/tests/test-admin-deploy-grub2.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-admin-deploy-karg.sh b/tests/test-admin-deploy-karg.sh index 9bd5025d..8667231b 100755 --- a/tests/test-admin-deploy-karg.sh +++ b/tests/test-admin-deploy-karg.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-admin-deploy-nomerge.sh b/tests/test-admin-deploy-nomerge.sh index 8637691c..9016f2d5 100755 --- a/tests/test-admin-deploy-nomerge.sh +++ b/tests/test-admin-deploy-nomerge.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-admin-deploy-none.sh b/tests/test-admin-deploy-none.sh index 982addbe..22a77001 100755 --- a/tests/test-admin-deploy-none.sh +++ b/tests/test-admin-deploy-none.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-admin-deploy-switch.sh b/tests/test-admin-deploy-switch.sh index 275ba026..ccbe5b70 100755 --- a/tests/test-admin-deploy-switch.sh +++ b/tests/test-admin-deploy-switch.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-admin-deploy-syslinux.sh b/tests/test-admin-deploy-syslinux.sh index 8f9f0259..d2cb5045 100755 --- a/tests/test-admin-deploy-syslinux.sh +++ b/tests/test-admin-deploy-syslinux.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-admin-deploy-uboot.sh b/tests/test-admin-deploy-uboot.sh index 98bd580b..9a4d773b 100755 --- a/tests/test-admin-deploy-uboot.sh +++ b/tests/test-admin-deploy-uboot.sh @@ -16,9 +16,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-admin-gpg.sh b/tests/test-admin-gpg.sh index bd34aae4..dcf075c1 100755 --- a/tests/test-admin-gpg.sh +++ b/tests/test-admin-gpg.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-admin-instutil-set-kargs.sh b/tests/test-admin-instutil-set-kargs.sh index a6d40813..a1aabef5 100755 --- a/tests/test-admin-instutil-set-kargs.sh +++ b/tests/test-admin-instutil-set-kargs.sh @@ -16,9 +16,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-admin-locking.sh b/tests/test-admin-locking.sh index 05bdb9bf..5a4b7bfd 100755 --- a/tests/test-admin-locking.sh +++ b/tests/test-admin-locking.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-admin-pull-deploy-commit.sh b/tests/test-admin-pull-deploy-commit.sh index f1323913..33905c3f 100755 --- a/tests/test-admin-pull-deploy-commit.sh +++ b/tests/test-admin-pull-deploy-commit.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . # See https://github.com/GNOME/ostree/pull/145 diff --git a/tests/test-admin-pull-deploy-split.sh b/tests/test-admin-pull-deploy-split.sh index 8695024e..52bec63a 100755 --- a/tests/test-admin-pull-deploy-split.sh +++ b/tests/test-admin-pull-deploy-split.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . # See https://github.com/ostreedev/ostree/pull/642 diff --git a/tests/test-admin-upgrade-endoflife.sh b/tests/test-admin-upgrade-endoflife.sh index cb2abd7e..ecac228f 100755 --- a/tests/test-admin-upgrade-endoflife.sh +++ b/tests/test-admin-upgrade-endoflife.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-admin-upgrade-not-backwards.sh b/tests/test-admin-upgrade-not-backwards.sh index 599284dc..faf140cd 100755 --- a/tests/test-admin-upgrade-not-backwards.sh +++ b/tests/test-admin-upgrade-not-backwards.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-admin-upgrade-systemd-update.sh b/tests/test-admin-upgrade-systemd-update.sh index b1f9956b..6e3aec39 100755 --- a/tests/test-admin-upgrade-systemd-update.sh +++ b/tests/test-admin-upgrade-systemd-update.sh @@ -13,9 +13,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-admin-upgrade-unconfigured.sh b/tests/test-admin-upgrade-unconfigured.sh index 5cb588af..b7b3e8b7 100755 --- a/tests/test-admin-upgrade-unconfigured.sh +++ b/tests/test-admin-upgrade-unconfigured.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-archivez.sh b/tests/test-archivez.sh index c27ce03f..e001bc2a 100755 --- a/tests/test-archivez.sh +++ b/tests/test-archivez.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-auto-summary.sh b/tests/test-auto-summary.sh index 3a04f184..22680767 100755 --- a/tests/test-auto-summary.sh +++ b/tests/test-auto-summary.sh @@ -16,9 +16,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-basic-c.c b/tests/test-basic-c.c index ff6d353c..bac7d56d 100644 --- a/tests/test-basic-c.c +++ b/tests/test-basic-c.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/tests/test-basic-root.sh b/tests/test-basic-root.sh index b06aa4a8..0bbc6c23 100755 --- a/tests/test-basic-root.sh +++ b/tests/test-basic-root.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-basic-user-only.sh b/tests/test-basic-user-only.sh index 568f9e95..368abf0d 100755 --- a/tests/test-basic-user-only.sh +++ b/tests/test-basic-user-only.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-basic-user.sh b/tests/test-basic-user.sh index fa17beee..22e9f40d 100755 --- a/tests/test-basic-user.sh +++ b/tests/test-basic-user.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-basic.sh b/tests/test-basic.sh index b1bc37e5..c7dafe11 100755 --- a/tests/test-basic.sh +++ b/tests/test-basic.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-bloom.c b/tests/test-bloom.c index ea522ce0..970a882f 100644 --- a/tests/test-bloom.c +++ b/tests/test-bloom.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Authors: * - Philip Withnall diff --git a/tests/test-bsdiff.c b/tests/test-bsdiff.c index a6b7fc01..4a9ac6cb 100644 --- a/tests/test-bsdiff.c +++ b/tests/test-bsdiff.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/tests/test-checksum.c b/tests/test-checksum.c index 8428155a..85d1c262 100644 --- a/tests/test-checksum.c +++ b/tests/test-checksum.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/tests/test-cli-extensions.sh b/tests/test-cli-extensions.sh new file mode 100755 index 00000000..1fe9c037 --- /dev/null +++ b/tests/test-cli-extensions.sh @@ -0,0 +1,31 @@ +#!/usr/bin/env bash +# +# Copyright (C) 2021 Red Hat Inc. +# SPDX-License-Identifier: LGPL-2.0+ + +set -euo pipefail + +. $(dirname $0)/libtest.sh + +echo '1..2' + +mkdir -p ./localbin +ORIG_PATH="${PATH}" +export PATH="./localbin/:${PATH}" +ln -s /usr/bin/env ./localbin/ostree-env +export A_CUSTOM_TEST_FLAG="myvalue" +${CMD_PREFIX} ostree env >out.txt +assert_file_has_content out.txt "^A_CUSTOM_TEST_FLAG=myvalue" +PATH="${ORIG_PATH}" +export -n A_CUSTOM_TEST_FLAG +rm -rf -- localbin + +echo 'ok CLI extension localbin ostree-env' + +if ${CMD_PREFIX} ostree nosuchcommand 2>err.txt; then + assert_not_reached "missing CLI extension ostree-nosuchcommand succeeded" +fi +assert_file_has_content err.txt "Unknown command 'nosuchcommand'" +rm -f -- err.txt + +echo 'ok CLI extension unknown ostree-nosuchcommand' diff --git a/tests/test-commit-sign-sh-ext.c b/tests/test-commit-sign-sh-ext.c index b5c5dcc6..6dc287d9 100644 --- a/tests/test-commit-sign-sh-ext.c +++ b/tests/test-commit-sign-sh-ext.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" @@ -44,6 +42,7 @@ corrupt (GBytes *input) g_assert_cmpint (len, >, 0); g_assert_cmpint (len, <, G_MAXINT); g_autofree char *newbuf = g_memdup (buf, len); + g_assert (newbuf != NULL); int o = g_random_int_range (0, len); newbuf[o] = (newbuf[0] + 1); @@ -81,26 +80,26 @@ run (GError **error) if (ostree_repo_signature_verify_commit_data (repo, "origin", commit_bytes, detached_meta_bytes, OSTREE_REPO_VERIFY_FLAGS_NO_GPG | OSTREE_REPO_VERIFY_FLAGS_NO_SIGNAPI, &verify_report, error)) - g_error ("Should not have validated"); + return glnx_throw (error, "Should not have validated"); assert_error_contains (error, "No commit verification types enabled"); // No signatures g_autoptr(GBytes) empty = g_bytes_new_static ("", 0); if (ostree_repo_signature_verify_commit_data (repo, "origin", commit_bytes, empty, 0, &verify_report, error)) - g_error ("Should not have validated"); + return glnx_throw (error, "Should not have validated"); assert_error_contains (error, "no signatures found"); // No such remote if (ostree_repo_signature_verify_commit_data (repo, "nosuchremote", commit_bytes, detached_meta_bytes, 0, &verify_report, error)) - g_error ("Should not have validated"); + return glnx_throw (error, "Should not have validated"); assert_error_contains (error, "Remote \"nosuchremote\" not found"); // Corrupted commit g_autoptr(GBytes) corrupted_commit = corrupt (commit_bytes); if (ostree_repo_signature_verify_commit_data (repo, "origin", corrupted_commit, detached_meta_bytes, 0, &verify_report, error)) - g_error ("Should not have validated"); + return glnx_throw (error, "Should not have validated"); assert_error_contains (error, "BAD signature"); return TRUE; diff --git a/tests/test-commit-sign.sh b/tests/test-commit-sign.sh index e1759198..2aad1cff 100755 --- a/tests/test-commit-sign.sh +++ b/tests/test-commit-sign.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-concurrency.py b/tests/test-concurrency.py index 3679ddb6..99b7436b 100755 --- a/tests/test-concurrency.py +++ b/tests/test-concurrency.py @@ -13,9 +13,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . from __future__ import division from __future__ import print_function diff --git a/tests/test-config.sh b/tests/test-config.sh index 2f44c30b..2d9aaf53 100755 --- a/tests/test-config.sh +++ b/tests/test-config.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-core.js b/tests/test-core.js index b804e007..ddc7f344 100755 --- a/tests/test-core.js +++ b/tests/test-core.js @@ -15,9 +15,7 @@ // Lesser General Public License for more details. // // You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the -// Free Software Foundation, Inc., 59 Temple Place - Suite 330, -// Boston, MA 02111-1307, USA. +// License along with this library. If not, see . const ByteArray = imports.byteArray; const Gio = imports.gi.Gio; diff --git a/tests/test-corruption.sh b/tests/test-corruption.sh index 2b5e61bb..055870d1 100755 --- a/tests/test-corruption.sh +++ b/tests/test-corruption.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-create-usb.sh b/tests/test-create-usb.sh index 8187ea75..016d32c7 100755 --- a/tests/test-create-usb.sh +++ b/tests/test-create-usb.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . # # Authors: # - Philip Withnall diff --git a/tests/test-delta-ed25519.sh b/tests/test-delta-ed25519.sh index ef732cf9..791b316e 100755 --- a/tests/test-delta-ed25519.sh +++ b/tests/test-delta-ed25519.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-delta-sign.sh b/tests/test-delta-sign.sh index ed471db9..c6e9e57c 100755 --- a/tests/test-delta-sign.sh +++ b/tests/test-delta-sign.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-delta.sh b/tests/test-delta.sh index bfdec593..2a630267 100755 --- a/tests/test-delta.sh +++ b/tests/test-delta.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-demo-buildsystem.sh b/tests/test-demo-buildsystem.sh index c1119192..2dc78dc3 100755 --- a/tests/test-demo-buildsystem.sh +++ b/tests/test-demo-buildsystem.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-export.sh b/tests/test-export.sh index 17f7c024..e490ae40 100755 --- a/tests/test-export.sh +++ b/tests/test-export.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-find-remotes.sh b/tests/test-find-remotes.sh index 044bd468..abcc41dc 100755 --- a/tests/test-find-remotes.sh +++ b/tests/test-find-remotes.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-fsck-collections.sh b/tests/test-fsck-collections.sh index dc6bcfeb..3dbcdd23 100755 --- a/tests/test-fsck-collections.sh +++ b/tests/test-fsck-collections.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-fsck-delete.sh b/tests/test-fsck-delete.sh index 3e7347bb..4795d7fb 100755 --- a/tests/test-fsck-delete.sh +++ b/tests/test-fsck-delete.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-gpg-signed-commit.sh b/tests/test-gpg-signed-commit.sh index 67ce4f74..7b00f9e9 100755 --- a/tests/test-gpg-signed-commit.sh +++ b/tests/test-gpg-signed-commit.sh @@ -16,9 +16,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-gpg-verify-result.c b/tests/test-gpg-verify-result.c index 5ae129b9..d49224ec 100644 --- a/tests/test-gpg-verify-result.c +++ b/tests/test-gpg-verify-result.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/tests/test-help.sh b/tests/test-help.sh index 912e41bc..5c08235b 100755 --- a/tests/test-help.sh +++ b/tests/test-help.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-include-ostree-h.c b/tests/test-include-ostree-h.c index af41bb3c..e23dc185 100644 --- a/tests/test-include-ostree-h.c +++ b/tests/test-include-ostree-h.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Authors: * - Matthew Leeds diff --git a/tests/test-init-collections.sh b/tests/test-init-collections.sh index 1954f1ae..54224dcf 100755 --- a/tests/test-init-collections.sh +++ b/tests/test-init-collections.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-kargs.c b/tests/test-kargs.c index d8370555..92441fb6 100644 --- a/tests/test-kargs.c +++ b/tests/test-kargs.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/tests/test-keyfile-utils.c b/tests/test-keyfile-utils.c index 3014cf16..49ac10fd 100644 --- a/tests/test-keyfile-utils.c +++ b/tests/test-keyfile-utils.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/tests/test-libarchive-import.c b/tests/test-libarchive-import.c index 821a8869..716aa306 100644 --- a/tests/test-libarchive-import.c +++ b/tests/test-libarchive-import.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/tests/test-libarchive.sh b/tests/test-libarchive.sh index 73a58ddd..63175023 100755 --- a/tests/test-libarchive.sh +++ b/tests/test-libarchive.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-local-pull-depth.sh b/tests/test-local-pull-depth.sh index 80413bc9..f81eabfa 100755 --- a/tests/test-local-pull-depth.sh +++ b/tests/test-local-pull-depth.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-local-pull.sh b/tests/test-local-pull.sh index 555e9b26..79b86abc 100755 --- a/tests/test-local-pull.sh +++ b/tests/test-local-pull.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-lzma.c b/tests/test-lzma.c index c3ece965..c26bc8d2 100644 --- a/tests/test-lzma.c +++ b/tests/test-lzma.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/tests/test-mock-gio.c b/tests/test-mock-gio.c index 71514b06..bf7f5fcb 100644 --- a/tests/test-mock-gio.c +++ b/tests/test-mock-gio.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Authors: * - Philip Withnall diff --git a/tests/test-mock-gio.h b/tests/test-mock-gio.h index a96eca22..2cc38f15 100644 --- a/tests/test-mock-gio.h +++ b/tests/test-mock-gio.h @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Authors: * - Philip Withnall diff --git a/tests/test-mutable-tree.c b/tests/test-mutable-tree.c index d0dfdd74..e5a6b040 100644 --- a/tests/test-mutable-tree.c +++ b/tests/test-mutable-tree.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/tests/test-oldstyle-partial.sh b/tests/test-oldstyle-partial.sh index 24bbdd49..d791c622 100755 --- a/tests/test-oldstyle-partial.sh +++ b/tests/test-oldstyle-partial.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-osupdate-dtb.sh b/tests/test-osupdate-dtb.sh index 33e752f5..8549f966 100755 --- a/tests/test-osupdate-dtb.sh +++ b/tests/test-osupdate-dtb.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-ot-opt-utils.c b/tests/test-ot-opt-utils.c index 6b01e93b..45de154d 100644 --- a/tests/test-ot-opt-utils.c +++ b/tests/test-ot-opt-utils.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/tests/test-ot-tool-util.c b/tests/test-ot-tool-util.c index 82b8da6a..6eb3520e 100644 --- a/tests/test-ot-tool-util.c +++ b/tests/test-ot-tool-util.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/tests/test-ot-unix-utils.c b/tests/test-ot-unix-utils.c index 3847100a..3f16b55d 100644 --- a/tests/test-ot-unix-utils.c +++ b/tests/test-ot-unix-utils.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/tests/test-parent.sh b/tests/test-parent.sh index b62b9557..4b5806c5 100755 --- a/tests/test-parent.sh +++ b/tests/test-parent.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-pre-signed-pull.sh b/tests/test-pre-signed-pull.sh index 20f2b597..2a1a1d23 100755 --- a/tests/test-pre-signed-pull.sh +++ b/tests/test-pre-signed-pull.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-prune-collections.sh b/tests/test-prune-collections.sh index e034bd90..c5bb2704 100755 --- a/tests/test-prune-collections.sh +++ b/tests/test-prune-collections.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-prune.sh b/tests/test-prune.sh index e8734801..e33ab1e7 100755 --- a/tests/test-prune.sh +++ b/tests/test-prune.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-pull-bare.sh b/tests/test-pull-bare.sh index a9eaed6c..f0493628 100755 --- a/tests/test-pull-bare.sh +++ b/tests/test-pull-bare.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-pull-bareuser.sh b/tests/test-pull-bareuser.sh index 6bdd304e..033693f5 100755 --- a/tests/test-pull-bareuser.sh +++ b/tests/test-pull-bareuser.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-pull-bareuseronly.sh b/tests/test-pull-bareuseronly.sh index a3b23d5b..677ad4c2 100755 --- a/tests/test-pull-bareuseronly.sh +++ b/tests/test-pull-bareuseronly.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-pull-basicauth.sh b/tests/test-pull-basicauth.sh index 4a2622a7..68287355 100755 --- a/tests/test-pull-basicauth.sh +++ b/tests/test-pull-basicauth.sh @@ -13,9 +13,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-pull-c.c b/tests/test-pull-c.c index 4d6cd17b..3957e43b 100644 --- a/tests/test-pull-c.c +++ b/tests/test-pull-c.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/tests/test-pull-collections.sh b/tests/test-pull-collections.sh index 6882e982..1d14e5db 100755 --- a/tests/test-pull-collections.sh +++ b/tests/test-pull-collections.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-pull-commit-only.sh b/tests/test-pull-commit-only.sh index caca92fc..2f162225 100755 --- a/tests/test-pull-commit-only.sh +++ b/tests/test-pull-commit-only.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-pull-contenturl.sh b/tests/test-pull-contenturl.sh index 4dee0ccc..ba6a2a5f 100755 --- a/tests/test-pull-contenturl.sh +++ b/tests/test-pull-contenturl.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-pull-corruption.sh b/tests/test-pull-corruption.sh index 61da575c..66963d0c 100755 --- a/tests/test-pull-corruption.sh +++ b/tests/test-pull-corruption.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-pull-depth.sh b/tests/test-pull-depth.sh index 8fb2f597..6f330349 100755 --- a/tests/test-pull-depth.sh +++ b/tests/test-pull-depth.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-pull-large-metadata.sh b/tests/test-pull-large-metadata.sh index acf42c76..4394cc52 100755 --- a/tests/test-pull-large-metadata.sh +++ b/tests/test-pull-large-metadata.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-pull-localcache.sh b/tests/test-pull-localcache.sh index 3de1e5ab..a10a93ee 100755 --- a/tests/test-pull-localcache.sh +++ b/tests/test-pull-localcache.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-pull-metalink.sh b/tests/test-pull-metalink.sh index 263d29b4..f73992b4 100755 --- a/tests/test-pull-metalink.sh +++ b/tests/test-pull-metalink.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-pull-mirror-summary.sh b/tests/test-pull-mirror-summary.sh index a2a98bad..94a8c020 100755 --- a/tests/test-pull-mirror-summary.sh +++ b/tests/test-pull-mirror-summary.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-pull-mirrorlist.sh b/tests/test-pull-mirrorlist.sh index ed65eb64..1d0d2c58 100755 --- a/tests/test-pull-mirrorlist.sh +++ b/tests/test-pull-mirrorlist.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-pull-override-url.sh b/tests/test-pull-override-url.sh index db93839b..71a32714 100755 --- a/tests/test-pull-override-url.sh +++ b/tests/test-pull-override-url.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-pull-repeated.sh b/tests/test-pull-repeated.sh index f0ea157e..4c321618 100755 --- a/tests/test-pull-repeated.sh +++ b/tests/test-pull-repeated.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-pull-resume.sh b/tests/test-pull-resume.sh index 8fa4a298..d9185787 100755 --- a/tests/test-pull-resume.sh +++ b/tests/test-pull-resume.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-pull-sizes.sh b/tests/test-pull-sizes.sh index 1ce0a736..95d1aadf 100755 --- a/tests/test-pull-sizes.sh +++ b/tests/test-pull-sizes.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-pull-subpath.sh b/tests/test-pull-subpath.sh index 3bf89aff..9408a974 100755 --- a/tests/test-pull-subpath.sh +++ b/tests/test-pull-subpath.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-pull-summary-caching.sh b/tests/test-pull-summary-caching.sh index 37c2aed6..8c6727d0 100755 --- a/tests/test-pull-summary-caching.sh +++ b/tests/test-pull-summary-caching.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . # # Authors: # - Philip Withnall diff --git a/tests/test-pull-summary-sigs.sh b/tests/test-pull-summary-sigs.sh index 04a8e488..03a40e46 100755 --- a/tests/test-pull-summary-sigs.sh +++ b/tests/test-pull-summary-sigs.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-pull-untrusted.sh b/tests/test-pull-untrusted.sh index ec48eb3e..a9826e86 100755 --- a/tests/test-pull-untrusted.sh +++ b/tests/test-pull-untrusted.sh @@ -16,9 +16,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-pull2-bareuseronly.sh b/tests/test-pull2-bareuseronly.sh index 18614250..fd82b68d 100755 --- a/tests/test-pull2-bareuseronly.sh +++ b/tests/test-pull2-bareuseronly.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-refs-collections.sh b/tests/test-refs-collections.sh index d33f498c..8bdc50d7 100755 --- a/tests/test-refs-collections.sh +++ b/tests/test-refs-collections.sh @@ -16,9 +16,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-refs.sh b/tests/test-refs.sh index d0f8e7da..3653d035 100755 --- a/tests/test-refs.sh +++ b/tests/test-refs.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-remote-add-collections.sh b/tests/test-remote-add-collections.sh index b82a13a6..5d383fa3 100755 --- a/tests/test-remote-add-collections.sh +++ b/tests/test-remote-add-collections.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-remote-add.sh b/tests/test-remote-add.sh index 40a32f57..2f5ea634 100755 --- a/tests/test-remote-add.sh +++ b/tests/test-remote-add.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-remote-cookies.sh b/tests/test-remote-cookies.sh index e94a70d1..b9b95a1f 100755 --- a/tests/test-remote-cookies.sh +++ b/tests/test-remote-cookies.sh @@ -16,9 +16,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-remote-gpg-import.sh b/tests/test-remote-gpg-import.sh index cf13b499..69e342cf 100755 --- a/tests/test-remote-gpg-import.sh +++ b/tests/test-remote-gpg-import.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-remote-gpg-list-keys.sh b/tests/test-remote-gpg-list-keys.sh index 51b60084..1c1697d1 100755 --- a/tests/test-remote-gpg-list-keys.sh +++ b/tests/test-remote-gpg-list-keys.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-remote-headers.sh b/tests/test-remote-headers.sh index a41d087a..d3bf4f97 100755 --- a/tests/test-remote-headers.sh +++ b/tests/test-remote-headers.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-remotes-config-dir.js b/tests/test-remotes-config-dir.js index f73a82ef..afde0d67 100755 --- a/tests/test-remotes-config-dir.js +++ b/tests/test-remotes-config-dir.js @@ -16,9 +16,7 @@ // Lesser General Public License for more details. // // You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the -// Free Software Foundation, Inc., 59 Temple Place - Suite 330, -// Boston, MA 02111-1307, USA. +// License along with this library. If not, see . const GLib = imports.gi.GLib; const Gio = imports.gi.Gio; diff --git a/tests/test-repo-finder-avahi.c b/tests/test-repo-finder-avahi.c index 4c9c66e0..932c80b1 100644 --- a/tests/test-repo-finder-avahi.c +++ b/tests/test-repo-finder-avahi.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Authors: * - Philip Withnall diff --git a/tests/test-repo-finder-config.c b/tests/test-repo-finder-config.c index 8a803aba..30f1b206 100644 --- a/tests/test-repo-finder-config.c +++ b/tests/test-repo-finder-config.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Authors: * - Philip Withnall diff --git a/tests/test-repo-finder-mount-integration.sh b/tests/test-repo-finder-mount-integration.sh index 9ecc4cd6..e7a0f86a 100755 --- a/tests/test-repo-finder-mount-integration.sh +++ b/tests/test-repo-finder-mount-integration.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . # # Authors: # - Philip Withnall diff --git a/tests/test-repo-finder-mount.c b/tests/test-repo-finder-mount.c index 5b670f50..3d360182 100644 --- a/tests/test-repo-finder-mount.c +++ b/tests/test-repo-finder-mount.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Authors: * - Philip Withnall diff --git a/tests/test-repo.c b/tests/test-repo.c index 0c7e0dd3..4a7a44a0 100644 --- a/tests/test-repo.c +++ b/tests/test-repo.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Authors: * - Philip Withnall diff --git a/tests/test-reset-nonlinear.sh b/tests/test-reset-nonlinear.sh index dca1be94..e31ac15e 100755 --- a/tests/test-reset-nonlinear.sh +++ b/tests/test-reset-nonlinear.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-rfc2616-dates.c b/tests/test-rfc2616-dates.c index d3f2073e..55807f16 100644 --- a/tests/test-rfc2616-dates.c +++ b/tests/test-rfc2616-dates.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Authors: * - Philip Withnall diff --git a/tests/test-rofiles-fuse.sh b/tests/test-rofiles-fuse.sh index 55816899..a56a76c6 100755 --- a/tests/test-rofiles-fuse.sh +++ b/tests/test-rofiles-fuse.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-rollsum-cli.c b/tests/test-rollsum-cli.c index 6e5f9f4f..44e3390c 100644 --- a/tests/test-rollsum-cli.c +++ b/tests/test-rollsum-cli.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/tests/test-rollsum.c b/tests/test-rollsum.c index 08aea235..57f7aa06 100644 --- a/tests/test-rollsum.c +++ b/tests/test-rollsum.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/tests/test-signed-commit.sh b/tests/test-signed-commit.sh index d43efef7..47aba390 100755 --- a/tests/test-signed-commit.sh +++ b/tests/test-signed-commit.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-signed-pull-summary.sh b/tests/test-signed-pull-summary.sh index 3d468693..2d6b2552 100755 --- a/tests/test-signed-pull-summary.sh +++ b/tests/test-signed-pull-summary.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . # Based on test-pull-summary-sigs.sh test. diff --git a/tests/test-signed-pull.sh b/tests/test-signed-pull.sh index fe78321a..372287f6 100755 --- a/tests/test-signed-pull.sh +++ b/tests/test-signed-pull.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-sizes.js b/tests/test-sizes.js index a2246536..b778b53b 100755 --- a/tests/test-sizes.js +++ b/tests/test-sizes.js @@ -15,9 +15,7 @@ // Lesser General Public License for more details. // // You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the -// Free Software Foundation, Inc., 59 Temple Place - Suite 330, -// Boston, MA 02111-1307, USA. +// License along with this library. If not, see . const GLib = imports.gi.GLib; const Gio = imports.gi.Gio; diff --git a/tests/test-summary-collections.sh b/tests/test-summary-collections.sh index 9885c5ea..f6089eed 100755 --- a/tests/test-summary-collections.sh +++ b/tests/test-summary-collections.sh @@ -16,9 +16,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail diff --git a/tests/test-summary-update.sh b/tests/test-summary-update.sh index ceaa5409..74c42d10 100755 --- a/tests/test-summary-update.sh +++ b/tests/test-summary-update.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . # # Authors: # - Philip Withnall diff --git a/tests/test-summary-view.sh b/tests/test-summary-view.sh index f6278a85..088628d8 100755 --- a/tests/test-summary-view.sh +++ b/tests/test-summary-view.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . # # Authors: # - Philip Withnall diff --git a/tests/test-symbols.sh b/tests/test-symbols.sh index a094a944..18e13e9f 100755 --- a/tests/test-symbols.sh +++ b/tests/test-symbols.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -xeuo pipefail @@ -56,7 +54,7 @@ echo 'ok documented symbols' # ONLY update this checksum in release commits! cat > released-sha256.txt <. */ #include "config.h" diff --git a/tests/test-sysroot.js b/tests/test-sysroot.js index f3db2b5e..d4f67ef4 100755 --- a/tests/test-sysroot.js +++ b/tests/test-sysroot.js @@ -15,9 +15,7 @@ // Lesser General Public License for more details. // // You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the -// Free Software Foundation, Inc., 59 Temple Place - Suite 330, -// Boston, MA 02111-1307, USA. +// License along with this library. If not, see . const GLib = imports.gi.GLib; const Gio = imports.gi.Gio; diff --git a/tests/test-varint.c b/tests/test-varint.c index 605b7432..e86c008f 100644 --- a/tests/test-varint.c +++ b/tests/test-varint.c @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" diff --git a/tests/test-xattrs.sh b/tests/test-xattrs.sh index 07c9ac38..10485a80 100755 --- a/tests/test-xattrs.sh +++ b/tests/test-xattrs.sh @@ -15,9 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library. If not, see . set -euo pipefail