Hello community, here is the log from the commit of package daps for openSUSE:Factory checked in at 2015-06-30 10:16:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/daps (Old) and /work/SRC/openSUSE:Factory/.daps.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "daps" Changes: -------- --- /work/SRC/openSUSE:Factory/daps/daps.changes 2015-06-18 06:37:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.daps.new/daps.changes 2015-06-30 10:16:43.000000000 +0200 @@ -1,0 +2,13 @@ +Fri Jun 19 09:21:31 UTC 2015 - [email protected] + +Stable release DAPS 2.0: + +- supporting rng _and_ rnc schemas for validation with jing +- added a --debug switch and error reporting to daps_autobuild +- moved a --meta related warning so it does not get displayed + when running a *-name subcommand +- fixed a quoting issue in daps-migrate and daps_functions +- fixed an error in the DB4->DB5 migration stylesheet (formatting + was lost on <term> tags) + +------------------------------------------------------------------- Old: ---- daps-2.0~rc7.tar.bz2 New: ---- daps-2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ daps.spec ++++++ --- /var/tmp/diff_new_pack.L0pLZf/_old 2015-06-30 10:16:44.000000000 +0200 +++ /var/tmp/diff_new_pack.L0pLZf/_new 2015-06-30 10:16:44.000000000 +0200 @@ -17,7 +17,7 @@ Name: daps -Version: 2.0~rc7 +Version: 2.0 Release: 0 ############################################################### ++++++ daps-2.0~rc7.tar.bz2 -> daps-2.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/daps/ChangeLog new/daps/ChangeLog --- old/daps/ChangeLog 2015-06-10 15:59:32.000000000 +0200 +++ new/daps/ChangeLog 2015-06-19 12:14:00.000000000 +0200 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Fri Jun 19 09:21:31 UTC 2015 - [email protected] + +Stable release DAPS 2.0: + +- supporting rng _and_ rnc schemas for validation with jing +- added a --debug switch and error reporting to daps_autobuild +- moved a --meta related warning so it does not get displayed + when running a *-name subcommand +- fixed a quoting issue in daps-migrate and daps_functions +- fixed an error in the DB4->DB5 migration stylesheet (formatting + was lost on <term> tags) + +------------------------------------------------------------------- Tue Jun 10 13:50:00 UTC 2015 - [email protected] New release DAPS 2.0~rc7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/daps/autobuild/daps_autobuild.in new/daps/autobuild/daps_autobuild.in --- old/daps/autobuild/daps_autobuild.in 2015-06-10 15:59:32.000000000 +0200 +++ new/daps/autobuild/daps_autobuild.in 2015-06-19 12:14:00.000000000 +0200 @@ -13,6 +13,7 @@ #VERBOSE=1 CHECK_VCS=1 +DEBUG=0 DO_RSYNC=1 RSYNC_DELETE="" SECTIONS="" @@ -57,6 +58,10 @@ Path to config file. Can be specified relative or absolute. Default: unset + --debug + In case of a build failure, show a verbose DAPS log. + Default: disabled + --force Manuals will only be rebuild when the git/svn repository has changed since the last build. Use this option to force a rebuild even when the @@ -227,7 +232,7 @@ git pull -q || return 1 echo " * Updated git branch $GITBRANCH" if [[ 1 -eq $CHECK_VCS ]]; then - NEWREV="$(git git rev-parse HEAD)" || return 2 + NEWREV="$(git rev-parse HEAD)" || return 2 [[ "$NEWREV" != "$_LASTREV" ]] && REBUILD="1" fi return 0 @@ -253,7 +258,7 @@ function run_daps { - local BUILDDIR DCFILE NAME RESULT _SET SUBCMD + local BUILDDIR DAPS_BASE_CMD DCFILE _FORMAT NAME NAME_CMD_ARGS ORIG_IFS RESULT RUNDAPS _SET SUBCMD # # Create the DAPS command and run DAPS # Expects 4 Arguments: @@ -269,12 +274,14 @@ [[ -z $2 ]] && exit_on_error "Function run_daps must be called with a DC-FILE" [[ -z $3 ]] && exit_on_error "Function run_daps must be called with a set ID" - SUBCMD="$1" + _FORMAT="$1" DCFILE="$2" _SET="$3" - if [[ single-html = "$SUBCMD" ]]; then + if [[ single-html = "$_FORMAT" ]]; then SUBCMD="html --single" + else + SUBCMD="$_FORMAT" fi NAME=${DCFILE//DC-/} @@ -282,9 +289,11 @@ # build the DAPS command # - RUNDAPS="${_DAPSROOT}/bin/daps --dapsroot $_DAPSROOT --builddir $BUILDDIR -d $DCFILE" - [[ -n $_STYLEROOT ]] && RUNDAPS="$RUNDAPS --styleroot=$_STYLEROOT" - [[ -n $_FB_STYLEROOT ]] && RUNDAPS="$RUNDAPS --fb_styleroot=$_FB_STYLEROOT" + DAPS_BASE_CMD="${_DAPSROOT}/bin/daps --dapsroot $_DAPSROOT --builddir $BUILDDIR -d $DCFILE" + [[ -n $_STYLEROOT ]] && DAPS_BASE_CMD="$DAPS_BASE_CMD --styleroot=$_STYLEROOT" + [[ -n $_FB_STYLEROOT ]] && DAPS_BASE_CMD="$DAPS_BASE_CMD --fb_styleroot=$_FB_STYLEROOT" + RUNDAPS="$DAPS_BASE_CMD" + [[ 1 -eq $DEBUG ]] && RUNDAPS="$RUNDAPS --debug" RUNDAPS="$RUNDAPS $SUBCMD --name $NAME" [[ -n $_DRAFT ]] && RUNDAPS="$RUNDAPS --draft" [[ -n $_REMARKS ]] && RUNDAPS="$RUNDAPS --remarks" @@ -292,19 +301,41 @@ [[ $SUBCMD = "html" || $SUBCMD = "pdf" ]] && RUNDAPS="$RUNDAPS --meta" fi - echo -n " * Building $SUBCMD version of $DCFILE ... " + echo -n " * Building $_FORMAT version of $DCFILE ... " RESULT="$($RUNDAPS)" if [[ 0 -eq $? ]]; then + $CCECHO "result" "Succeeded" SYNCDIR_DC="${SYNCDIR}/$NAME" + NAME_CMD_ARGS="--name $NAME" mkdir -p "$SYNCDIR_DC" - if [[ "pdf" = "$SUBCMD" ]]; then - mkdir -p "${SYNCDIR_DC}/pdf" - mv "$RESULT" "${SYNCDIR_DC}/pdf" - else - mv "$RESULT" "${SYNCDIR_DC}/$_FORMAT" + [[ -n $_DRAFT ]] && NAME_CMD_ARGS="$NAME_CMD_ARGS --draft" + [[ -n $_REMARKS ]] && NAME_CMD_ARGS="$NAME_CMD_ARGS --remarks" + if [[ -n $_META ]]; then + [[ $SUBCMD = "html" || $SUBCMD = "pdf" ]] && NAME_CMD_ARGS="$NAME_CMD_ARGS --meta" + fi + NAME_CMD_ARGS="$NAME_CMD_ARGS 2>/dev/null" + if [[ "pdf" = "$_FORMAT" ]]; then + RESULT="$($DAPS_BASE_CMD pdf-name $NAME_CMD_ARGS)" + mkdir -p "${SYNCDIR_DC}/$_FORMAT" + elif [[ "html" = "$_FORMAT" ]]; then + RESULT="$($DAPS_BASE_CMD html-dir-name $NAME_CMD_ARGS)" + elif [[ "single-html" = "$_FORMAT" ]]; then + RESULT="$($DAPS_BASE_CMD html-dir-name --single $NAME_CMD_ARGS)" fi + mv "$RESULT" "${SYNCDIR_DC}/$_FORMAT" return 0 else + $CCECHO "warn" "Failed" + FAILURES=$((FAILURES + 1)) + FAILED_BOOKS["$DC"]="${FAILED_BOOKS["$DC"]} $_FORMAT" + ORIG_IFS="$IFS" + IFS=$'\n' + echo -e "\e[33m" + for LINE in $RESULT; do + echo -e "\t$LINE" + done + echo -e "\e[0m" + IFS="$ORIG_IFS" return 1 fi } @@ -369,7 +400,7 @@ #-------------------- # Read command line options -ARGS=$(getopt -o h -l config:,force,help,helpconfig,nosync,notify,rsync,schema:,sections:,validate -n "$ME" -- "$@") +ARGS=$(getopt -o h -l config:,debug,force,help,helpconfig,nosync,notify,rsync,schema:,sections:,validate -n "$ME" -- "$@") # Exit when getopt returns errors # @@ -384,6 +415,10 @@ CONFIG="$(readlink -e "$2")" shift 2 ;; + --debug) + DEBUG=1 + shift + ;; --force) CHECK_VCS=0 shift @@ -489,7 +524,7 @@ fi # set up the sync directory - SYNCDIR="${_BUILDDIR}/$SET/sync" + SYNCDIR="${_BUILDDIR}/$SET/sync/$SET" rm -rf "$SYNCDIR" && mkdir -p "$SYNCDIR" echo -e "$SET\n-------------------------" @@ -572,14 +607,6 @@ for DC in $_DCFILES; do # Build! run_daps "$_FORMAT" "$DC" "$SET" - # Check build result - if [[ 0 -eq $? ]]; then - $CCECHO "result" "Succeeded" - else - $CCECHO "warn" "Failed" - FAILURES=$((FAILURES + 1)) - FAILED_BOOKS["$DC"]="${FAILED_BOOKS["$DC"]} $_FORMAT" - fi done done else @@ -618,7 +645,7 @@ # rsync if [[ 1 -eq $DO_RSYNC ]]; then - $RSYNC $_RSYNC_FLAGS $RSYNC_DELETE "$SYNCDIR/" "$_RSYNC_TARGET" + $RSYNC $_RSYNC_FLAGS $RSYNC_DELETE $SYNCDIR $_RSYNC_TARGET if [[ 0 -eq $? ]]; then $CCECHO "result" " Rsync successful" else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/daps/configure new/daps/configure --- old/daps/configure 2015-06-10 15:59:32.000000000 +0200 +++ new/daps/configure 2015-06-19 12:14:00.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for DAPS 2.0.0-rc7. +# Generated by GNU Autoconf 2.69 for DAPS 2.0.0. # # Report bugs to <https://github.com/openSUSE/daps>. # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='DAPS' PACKAGE_TARNAME='daps' -PACKAGE_VERSION='2.0.0-rc7' -PACKAGE_STRING='DAPS 2.0.0-rc7' +PACKAGE_VERSION='2.0.0' +PACKAGE_STRING='DAPS 2.0.0' PACKAGE_BUGREPORT='https://github.com/openSUSE/daps' PACKAGE_URL='http://opensuse.github.io/daps' @@ -1264,7 +1264,7 @@ # 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 DAPS 2.0.0-rc7 to adapt to many kinds of systems. +\`configure' configures DAPS 2.0.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1330,7 +1330,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of DAPS 2.0.0-rc7:";; + short | recursive ) echo "Configuration of DAPS 2.0.0:";; esac cat <<\_ACEOF @@ -1419,7 +1419,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -DAPS configure 2.0.0-rc7 +DAPS configure 2.0.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1436,7 +1436,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by DAPS $as_me 2.0.0-rc7, which was +It was created by DAPS $as_me 2.0.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -1788,8 +1788,8 @@ DAPS_VERSION_MAJOR=2 DAPS_VERSION_MINOR=0 -DAPS_VERSION_MICRO=0-rc7 -DAPS_VERSION=2.0.0-rc7 +DAPS_VERSION_MICRO=0 +DAPS_VERSION=2.0.0 DAPS_API_VERSION=2 @@ -2349,7 +2349,7 @@ # Define the identity of the package. PACKAGE='daps' - VERSION='2.0.0-rc7' + VERSION='2.0.0' cat >>confdefs.h <<_ACEOF @@ -4537,7 +4537,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by DAPS $as_me 2.0.0-rc7, which was +This file was extended by DAPS $as_me 2.0.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4591,7 +4591,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -DAPS config.status 2.0.0-rc7 +DAPS config.status 2.0.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -5746,7 +5746,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by DAPS $as_me 2.0.0-rc7, which was +This file was extended by DAPS $as_me 2.0.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5800,7 +5800,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -DAPS config.status 2.0.0-rc7 +DAPS config.status 2.0.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/daps/configure.ac new/daps/configure.ac --- old/daps/configure.ac 2015-06-10 15:59:32.000000000 +0200 +++ new/daps/configure.ac 2015-06-19 12:14:00.000000000 +0200 @@ -11,7 +11,7 @@ m4_define(daps_version_major, 2) m4_define(daps_version_minor, 0) -m4_define(daps_version_micro, [0-rc7]) +m4_define(daps_version_micro, [0]) # API version m4_define([daps_api_version],[daps_version_major]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/daps/daps-xslt/migrate/suse-upgrade.xsl new/daps/daps-xslt/migrate/suse-upgrade.xsl --- old/daps/daps-xslt/migrate/suse-upgrade.xsl 2015-06-10 15:59:32.000000000 +0200 +++ new/daps/daps-xslt/migrate/suse-upgrade.xsl 2015-06-19 12:14:00.000000000 +0200 @@ -1314,6 +1314,13 @@ </xsl:element> </xsl:template> + <xsl:template match="varlistentry/term"> + <xsl:element name="{local-name(.)}"> + <xsl:call-template name="copy.attributes"/> + <xsl:apply-templates /> + </xsl:element> + </xsl:template> + <!-- The synopsis elements have child elements that don't work inside phrase, plus they have attributes that shouldn't be lost. So, leave as is, but warn. --> <xsl:template diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/daps/etc/config.in new/daps/etc/config.in --- old/daps/etc/config.in 2015-06-10 15:59:32.000000000 +0200 +++ new/daps/etc/config.in 2015-06-19 12:14:00.000000000 +0200 @@ -203,8 +203,6 @@ # URI to the DocBook 5 Relax NG schema that can be resolved by xmlcatalog # There should be no need to change this entry # -# NOTE: Do not use a link to the compact scheme here (.rnc) !! -# DOCBOOK5_RNG_URI="http://docbook.org/xml/5.0/rng/docbookxi.rng"; ## Key: DRAFT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/daps/lib/daps_functions new/daps/lib/daps_functions --- old/daps/lib/daps_functions 2015-06-10 15:59:32.000000000 +0200 +++ new/daps/lib/daps_functions 2015-06-19 12:14:00.000000000 +0200 @@ -505,7 +505,7 @@ if [[ "fop" = "$FORMATTER" ]]; then cat <<EOF FORMATTER WRAPPER: $FOP_WRAPPER - FORMATTER CONFIG: $FOP_CONFIG_FILE" + FORMATTER CONFIG: $FOP_CONFIG_FILE EOF elif [[ "xep" = "$FORMATTER" ]]; then cat <<EOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/daps/libexec/daps-migrate new/daps/libexec/daps-migrate --- old/daps/libexec/daps-migrate 2015-06-10 15:59:32.000000000 +0200 +++ new/daps/libexec/daps-migrate 2015-06-19 12:14:00.000000000 +0200 @@ -199,9 +199,9 @@ cp "$HEADERFILE" "$xmlout" get_rootelement "$xmlin" sed -i "s/$ROOTREPLACE/$ROOTELEMENT/" "$xmlout" - xsltproc --nonet "${p}" "$MIGRATE_XSLT" "$xmlin" >> "$xmlout" 2>> "$XSLTPROCLOG" + xsltproc --nonet ${p} "$MIGRATE_XSLT" "$xmlin" >> "$xmlout" 2>> "$XSLTPROCLOG" else - xsltproc --nonet --output "$xmlout" "${p}" "$MIGRATE_XSLT" "$xmlin" 2>> "$XSLTPROCLOG" + xsltproc --nonet --output "$xmlout" ${p} "$MIGRATE_XSLT" "$xmlin" 2>> "$XSLTPROCLOG" fi # ERRCODE=$? dump "--------------------------------------------------" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/daps/make/common_variables.mk new/daps/make/common_variables.mk --- old/daps/make/common_variables.mk 2015-06-10 15:59:32.000000000 +0200 +++ new/daps/make/common_variables.mk 2015-06-19 12:14:00.000000000 +0200 @@ -124,16 +124,6 @@ --file $(MAIN) $(XSLTPROCESSOR)) endif -# Issue a warning when specifying --meta without profiling -# -ifeq "$(META)" "1" - ifndef PROFILE_URN - $(warning $(shell ccecho "warn" "Did not find a profiling URN. Displaying meta information only works with profiling.")) - endif -endif - - -# # 2. Set PROFILEDIR and profiling stringparams # # The directory name depends on the profiling values of the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/daps/make/locdrop.mk new/daps/make/locdrop.mk --- old/daps/make/locdrop.mk 2015-06-10 15:59:32.000000000 +0200 +++ new/daps/make/locdrop.mk 2015-06-19 12:14:00.000000000 +0200 @@ -15,13 +15,6 @@ # * Color PDF # -# -# Get translation info from a docmanager header -# xml sel -N ns0="urn:x-suse:ns:docmanager" -N db5="http://docbook.org/ns/docbook"; -t -m "/*/db5:info/ns0:docmanager" -v "normalize-space(ns0:translation)" xml/depl_nodes.xml -# -# returns: true|fals|<error> - - # Defined in common_variables: # #LOCDROP_TMP_DIR @@ -41,8 +34,8 @@ define db5_get_trans for F in $(DOCFILES); do \ - R=`$(XMLSTARLET) sel -N dm="urn:x-suse:ns:docmanager" -N db5="http://docbook.org/ns/docbook"; -t -m "/*/db5:info/dm:docmanager" -v "normalize-space(dm:translation)" $$F 2>/dev/null || echo "false"`; \ - if [ "true" = "$$R" ]; then echo -n "$$F "; fi \ + R=`$(XMLSTARLET) sel -N dm="urn:x-suse:ns:docmanager" -N db5="http://docbook.org/ns/docbook"; -t -m "/*/db5:info/dm:docmanager" -v "normalize-space(dm:translation)" $$F 2>/dev/null || echo "no"`; \ + if [ "yes" = "$$R" ]; then echo -n "$$F "; fi \ done endef diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/daps/make/meta.mk new/daps/make/meta.mk --- old/daps/make/meta.mk 2015-06-10 15:59:32.000000000 +0200 +++ new/daps/make/meta.mk 2015-06-19 12:14:00.000000000 +0200 @@ -13,6 +13,10 @@ STYLEMETA := $(DAPSROOT)/daps-xslt/common/svn2docproperties.xsl ifeq "$(META)" "1" + # Issue a warning when specifying --meta without profiling + ifndef PROFILE_URN + $(warning $(shell ccecho "warn" "Did not find a profiling URN. Displaying meta information only works with profiling.")) + endif ifdef USESVN # meta information (author, last changed, etc) METASTRING := --param "use.meta=1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/daps/make/validate.mk new/daps/make/validate.mk --- old/daps/make/validate.mk 2015-06-10 15:59:32.000000000 +0200 +++ new/daps/make/validate.mk 2015-06-19 12:14:00.000000000 +0200 @@ -11,6 +11,10 @@ # Use xmllint for DocBook 4 and jing for DocBook 5 # (xmllint -> DTD, jing Relax NG) +ifeq "$(suffix $(DOCBOOK5_RNG))" ".rnc" + JING_RNC := -c +endif + .PHONY: validate $(PROFILEDIR)/.validate validate: $(PROFILES) ifeq "$(VERBOSITY)" "2" @@ -19,7 +23,7 @@ ifeq "$(DOCBOOK_VERSION)" "4" xmllint --noent --postvalid --noout --xinclude $(PROFILED_MAIN) else - ADDITIONAL_FLAGS="$(JING_FLAGS)" jing $(DOCBOOK5_RNG) \ + ADDITIONAL_FLAGS="$(JING_FLAGS)" jing $(JING_RNC) $(DOCBOOK5_RNG) \ $(PROFILED_MAIN) endif touch $(PROFILEDIR)/.validate diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/daps/man/xml/daps-autobuild.xml new/daps/man/xml/daps-autobuild.xml --- old/daps/man/xml/daps-autobuild.xml 2015-06-10 15:59:32.000000000 +0200 +++ new/daps/man/xml/daps-autobuild.xml 2015-06-19 12:14:00.000000000 +0200 @@ -71,6 +71,15 @@ </listitem> </varlistentry> <varlistentry> + <term>--debug</term> + <listitem> + <para> + In case of a build failure, show a verbose DAPS log. + Default: disabled + </para> + </listitem> + </varlistentry> + <varlistentry> <term>--force</term> <listitem> <para>
