Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package mm-common for openSUSE:Factory 
checked in at 2026-07-02 22:14:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mm-common (Old)
 and      /work/SRC/openSUSE:Factory/.mm-common.new.1982 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "mm-common"

Thu Jul  2 22:14:01 2026 rev:11 rq:1363132 version:1.0.8

Changes:
--------
--- /work/SRC/openSUSE:Factory/mm-common/mm-common.changes      2025-06-16 
11:11:52.529798150 +0200
+++ /work/SRC/openSUSE:Factory/.mm-common.new.1982/mm-common.changes    
2026-07-02 22:19:13.785030596 +0200
@@ -1,0 +2,9 @@
+Thu Jul  2 06:43:50 UTC 2026 - Bjørn Lie <[email protected]>
+
+- Update to version 1.0.8:
+  + doc-reference.am: Distribute .svg files from the HTML directory
+  + Skeletonmm: Add skeletonmm/tools/generate_from_gir.sh
+  + Meson build: Allow -Duse-network=if-no-local-tag-file (new
+    default value).
+
+-------------------------------------------------------------------

Old:
----
  mm-common-1.0.7.tar.xz

New:
----
  _scmsync.obsinfo
  build.specials.obscpio
  mm-common-1.0.8.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ mm-common.spec ++++++
--- /var/tmp/diff_new_pack.3fba9r/_old  2026-07-02 22:19:14.429052720 +0200
+++ /var/tmp/diff_new_pack.3fba9r/_new  2026-07-02 22:19:14.429052720 +0200
@@ -18,7 +18,7 @@
 
 
 Name:           mm-common
-Version:        1.0.7
+Version:        1.0.8
 Release:        0
 Summary:        Common build files of the GNOME C++ bindings
 License:        GPL-2.0-or-later

++++++ _scmsync.obsinfo ++++++
mtime: 1782974765
commit: 621bbb002c56f30aef2389c1dab7d1131c16229c8ca37eaf3bca89fc9df4642d
url: https://src.opensuse.org/GNOME/mm-common
revision: 621bbb002c56f30aef2389c1dab7d1131c16229c8ca37eaf3bca89fc9df4642d
projectscmsync: https://src.opensuse.org/GNOME/_ObsPrj

++++++ build.specials.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/.gitignore new/.gitignore
--- old/.gitignore      1970-01-01 01:00:00.000000000 +0100
+++ new/.gitignore      2026-07-02 08:46:05.000000000 +0200
@@ -0,0 +1,4 @@
+*.obscpio
+*.osc
+_build.*
+.pbuild

++++++ mm-common-1.0.7.tar.xz -> mm-common-1.0.8.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mm-common-1.0.7/ChangeLog 
new/mm-common-1.0.8/ChangeLog
--- old/mm-common-1.0.7/ChangeLog       2025-06-11 12:59:31.964467000 +0200
+++ new/mm-common-1.0.8/ChangeLog       2026-07-01 16:20:05.450915800 +0200
@@ -1,3 +1,43 @@
+2026-07-01  Kjell Ahlstedt  <[email protected]>
+
+  1.0.8
+
+2026-04-22  Kjell Ahlstedt  <[email protected]>
+
+  Add skeletonmm/tools/generate_from_gir.sh
+
+2025-12-16  Kjell Ahlstedt  <[email protected]>
+
+  Meson build: Allow -Duse-network=if-no-local-tag-file
+
+  This is use-network's new default value.
+  libstdc++.tag is downloaded only if it's necessary. Typically only
+  the first time mm-common is built in a new build directory.
+  As with use-network=false, the tag file is copied from the source
+  directory if it exists there, e.g. in an expanded tarball.
+  
+  See the last part of Discourse comment
+  
https://discourse.gnome.org/t/glibmm-windows-rm-is-not-recognised-as-an-internal-or-external-command/32916/12
+
+2025-11-15  Kjell Ahlstedt  <[email protected]>
+
+  doc-reference.am: Distribute .svg files from the HTML directory
+
+  Gtkmm's documentation contains .svg files.
+
+2025-09-18  Kjell Ahlstedt  <[email protected]>
+
+  Meson build: Use SPDX expression for license, take 2
+
+  The previous commit was not quite right.
+
+2025-09-16  Kjell Ahlstedt  <[email protected]>
+
+  Meson build: Use SPDX expression for license
+
+  This is the recommended format.
+  See https://gitlab.freedesktop.org/cairo/cairomm/-/merge_requests/33
+
 2025-06-11  Kjell Ahlstedt  <[email protected]>
 
   1.0.7
@@ -1517,50 +1557,3 @@
   (SORT_MEMBERS_CTORS_1ST): Enable.
   * Makefile.am (nobase_dist_doc_DATA): List new skeleton files.
 
-2009-09-13  Daniel Elstner  <[email protected]>
-
-  Check for a proper sed program during configure
-
-  * configure.ac: Call AC_PROG_SED to check for a proper sed program.
-  * Makefile.am (subst_manpage): Use $(SED) variable.
-  * build/dist-changelog.am (dist-changelog): ditto, in the expectation
-  that most modules using mm-common already assign $(SED) in one way or
-  another.
-
-2009-09-11  Daniel Elstner  <[email protected]>
-
-  Treat whitespace in glob patterns literally
-
-  * util/doc-{install,postprocess}.pl: Explicitly call the bsd_glob()
-  subroutine instead of the builtin glob() function.  Although the
-  builtin glob() is implemented in terms of bsd_glob(), it additionally
-  splits its argument into multiple patterns separated by whitespace.
-
-2009-09-10  Daniel Elstner  <[email protected]>
-
-  Escape $ before {} in M4 more consistently
-
-  * macros/mm-warnings.m4 (MM_ARG_ENABLE_WARNINGS): Apply cosmetics.
-  Put [] quotes around $ before {}.  Remove redundant curly braces.
-
-2009-09-09  Daniel Elstner  <[email protected]>
-
-  Make skeleton doc_input assignment more generic
-
-  * skeletonmm/doc/Makefile.am (doc_input): Also include non-generated
-  header files listed in $(files_extra_h), excluding wrap_init.h.
-
-2009-09-09  Daniel Elstner  <[email protected]>
-
-  Elaborate on skeletonmm in the documentation
-
-  * README: Write paragraph to briefly document the need to replace
-  any instances of "skeleton" or variations thereof in the content of
-  files as well as the filenames.
-
-2009-09-09  Daniel Elstner  <[email protected]>
-
-  Update date of top news entry
-
-  * NEWS: Change date of top entry to today.
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mm-common-1.0.7/Makefile.am 
new/mm-common-1.0.8/Makefile.am
--- old/mm-common-1.0.7/Makefile.am     2025-06-11 11:23:04.000000000 +0200
+++ new/mm-common-1.0.8/Makefile.am     2026-07-01 16:08:39.000000000 +0200
@@ -117,7 +117,8 @@
        skeletonmm/untracked/README
 
 skeletonmm_script_files = \
-  skeletonmm/tools/generate_defs_and_docs.sh
+  skeletonmm/tools/generate_defs_and_docs.sh \
+  skeletonmm/tools/generate_from_gir.sh
 
 skeletonmm_files = $(skeletonmm_script_files) $(skeletonmm_data_files)
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mm-common-1.0.7/NEWS new/mm-common-1.0.8/NEWS
--- old/mm-common-1.0.7/NEWS    2025-06-11 11:23:04.000000000 +0200
+++ new/mm-common-1.0.8/NEWS    2026-07-01 16:08:39.000000000 +0200
@@ -1,3 +1,27 @@
+mm-common 1.0.8 (2026-07-01)
+
+* doc-reference.am: Distribute .svg files from the HTML directory
+  (Kjell Ahlstedt)
+
+Skeletonmm:
+* Add skeletonmm/tools/generate_from_gir.sh
+  (Kjell Ahlstedt)
+
+Meson build:
+* Allow -Duse-network=if-no-local-tag-file (new default value)
+  (Kjell Ahlstedt)
+
+Additions to version 1.0.7 news (added 2026-07-01)
+
+Documentation:
+* Replace gtkmm.org by gtkmm.gnome.org.
+  (Kjell Ahlstedt)
+
+Skeletonmm and Meson build:
+* Require meson >= 0.62.0
+  (Kjell Ahlstedt)
+
+
 mm-common 1.0.7 (2025-06-11)
 
 * Don't specify colors in util/doxygen-extra.css.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mm-common-1.0.7/am_include/doc-reference.am 
new/mm-common-1.0.8/am_include/doc-reference.am
--- old/mm-common-1.0.7/am_include/doc-reference.am     2025-06-11 
11:23:04.000000000 +0200
+++ new/mm-common-1.0.8/am_include/doc-reference.am     2026-07-01 
16:08:39.000000000 +0200
@@ -34,7 +34,7 @@
 
 # A list of wildcard patterns matching the files from the HTML directory
 # generated by Doxygen which should be distributed and installed.
-htmlref_patterns ?= $(addprefix $(doc_outdir)/html/*.,css gif html js png)
+htmlref_patterns ?= $(addprefix $(doc_outdir)/html/*.,css gif html js png svg)
 
 # Locations of utilities shipped with glibmm.  Made overridable
 # in case the installed utilities cannot be used for some reason.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mm-common-1.0.7/configure.ac 
new/mm-common-1.0.8/configure.ac
--- old/mm-common-1.0.7/configure.ac    2025-06-11 11:23:04.000000000 +0200
+++ new/mm-common-1.0.8/configure.ac    2026-07-01 16:08:39.000000000 +0200
@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with mm-common.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_INIT([mm-common], [1.0.7], 
[https://gitlab.gnome.org/GNOME/mm-common/issues/],
+AC_INIT([mm-common], [1.0.8], 
[https://gitlab.gnome.org/GNOME/mm-common/issues/],
         [mm-common], [https://gtkmm.gnome.org/])
 AC_PREREQ([2.59])
 AC_CONFIG_SRCDIR([util/mm-common-prepare.in])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mm-common-1.0.7/meson.build 
new/mm-common-1.0.8/meson.build
--- old/mm-common-1.0.7/meson.build     2025-06-11 11:23:04.000000000 +0200
+++ new/mm-common-1.0.8/meson.build     2026-07-01 16:08:39.000000000 +0200
@@ -1,8 +1,8 @@
 # This file is part of mm-common.
 
 project('mm-common',
-  version: '1.0.7',
-  license: 'GPLv2+',
+  version: '1.0.8',
+  license: 'GPL-2.0-or-later',
   meson_version: '>= 0.62.0', # required for variables in pkgconfig.generate()
 )
 
@@ -268,6 +268,7 @@
   'tests/test1/main.cc',
   'tests/test2/main.cc',
   'tools/generate_defs_and_docs.sh',
+  'tools/generate_from_gir.sh',
   'tools/extra_defs_gen/generate_defs_skeleton.cc',
   'tools/extra_defs_gen/meson.build',
   'tools/m4/convert.m4',
@@ -306,11 +307,17 @@
   install_tag: 'doc',
 )
 
-# Either curl or wget is required for downloading libstdc++.tag,
-# used by Doxygen.
+# Either curl or wget is required for downloading libstdc++.tag, used by 
Doxygen.
+# If use_network_opt == 'if-no-local-tag-file', the download command is 
optional.
+# The libstdcxx-tag.py script will decide if it's needed. That's decided when
+# mm-common is built, not when it's configured.
+use_network_opt = get_option('use-network')
 download_cmd = 'none'
-if get_option('use-network')
-  download_cmd = find_program('curl', 'wget').full_path()
+if use_network_opt != 'false'
+  prog = find_program('curl', 'wget', required: use_network_opt == 'true')
+  if prog.found()
+    download_cmd = prog.full_path()
+  endif
 endif
 
 # Download libstdc++.tag if it does not exist or if it's out of date.
@@ -319,6 +326,7 @@
   command: [
     python3,
     script_dir / 'libstdcxx-tag.py',
+    use_network_opt,
     download_cmd,
     project_source_root / 'doctags',
     '@OUTPUT@',
@@ -404,7 +412,7 @@
   '------',
   meson.project_name() + ' ' + meson.project_version(),
   '',
-  '       Use network: @0@'.format(get_option('use-network')),
+  '       Use network: @0@'.format(use_network_opt),
   'Directories:',
   '            prefix: @0@'.format(install_prefix),
   '            bindir: @0@'.format(install_prefix / install_bindir),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mm-common-1.0.7/meson_options.txt 
new/mm-common-1.0.8/meson_options.txt
--- old/mm-common-1.0.7/meson_options.txt       2025-06-11 11:23:04.000000000 
+0200
+++ new/mm-common-1.0.8/meson_options.txt       2026-07-01 16:08:39.000000000 
+0200
@@ -1,2 +1,2 @@
-option('use-network', type: 'boolean', value: false,
-  description : 'Download Doxygen tag file from the network')
+option('use-network', type: 'combo', choices: ['false', 
'if-no-local-tag-file', 'true'],
+  value: 'if-no-local-tag-file', description : 'Download Doxygen tag file from 
the network')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mm-common-1.0.7/skeletonmm/meson.build 
new/mm-common-1.0.8/skeletonmm/meson.build
--- old/mm-common-1.0.7/skeletonmm/meson.build  2025-06-11 11:23:04.000000000 
+0200
+++ new/mm-common-1.0.8/skeletonmm/meson.build  2026-07-01 16:08:39.000000000 
+0200
@@ -2,7 +2,7 @@
 
 project('skeletonmm', 'cpp',
   version: '0.1.0',
-  license: 'LGPLv2.1+',
+  license: 'LGPL-2.1-or-later',
   default_options: [
     'cpp_std=c++17',
     'warning_level=1',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/mm-common-1.0.7/skeletonmm/skeleton/src/skeleton.defs 
new/mm-common-1.0.8/skeletonmm/skeleton/src/skeleton.defs
--- old/mm-common-1.0.7/skeletonmm/skeleton/src/skeleton.defs   2025-06-11 
11:23:04.000000000 +0200
+++ new/mm-common-1.0.8/skeletonmm/skeleton/src/skeleton.defs   2026-07-01 
16:08:39.000000000 +0200
@@ -1,5 +1,5 @@
 ;; Include generated API definition files
 (include skeleton_enums.defs)
 (include skeleton_methods.defs)
-(include skeleton_signals.defs)
 (include skeleton_vfuncs.defs)
+(include skeleton_signals.defs)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/mm-common-1.0.7/skeletonmm/tools/generate_defs_and_docs.sh 
new/mm-common-1.0.8/skeletonmm/tools/generate_defs_and_docs.sh
--- old/mm-common-1.0.7/skeletonmm/tools/generate_defs_and_docs.sh      
2025-06-11 11:23:04.000000000 +0200
+++ new/mm-common-1.0.8/skeletonmm/tools/generate_defs_and_docs.sh      
2026-07-01 16:08:39.000000000 +0200
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# skeletonmm/codegen/generate_defs_and_docs.sh
+# skeletonmm/tools/generate_defs_and_docs.sh
 
 # Global environment variables:
 # GMMPROC_GEN_SOURCE_DIR  Top directory where source files are searched for.
@@ -12,7 +12,7 @@
 # If you use jhbuild, you can set these environment variables equal to 
jhbuild's
 # configuration variables checkoutroot and buildroot, respectively.
 # Usually you can leave GMMPROC_GEN_SOURCE_DIR undefined.
-# If you have set buildroot=None, GMMPROC_GEN_BUILD_DIR can also be undefined.
+# If you have set buildroot=None, GMMPROC_GEN_BUILD_DIR can be undefined.
 
 # Generated files:
 #   skeletonmm/skeleton/src/skeleton_docs.xml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/mm-common-1.0.7/skeletonmm/tools/generate_from_gir.sh 
new/mm-common-1.0.8/skeletonmm/tools/generate_from_gir.sh
--- old/mm-common-1.0.7/skeletonmm/tools/generate_from_gir.sh   1970-01-01 
01:00:00.000000000 +0100
+++ new/mm-common-1.0.8/skeletonmm/tools/generate_from_gir.sh   2026-07-01 
16:08:39.000000000 +0200
@@ -0,0 +1,79 @@
+#!/bin/bash
+
+# skeletonmm/tools/generate_from_gir.sh
+
+# Global environment variables:
+# GMMPROC_GEN_SOURCE_DIR  Top directory where source files are searched for.
+#                         Default value: $(dirname "$0")/../..
+#                         i.e. 2 levels above this file.
+# GMMPROC_GEN_BUILD_DIR   Top directory where built files are searched for.
+#                         Default value: $GMMPROC_GEN_SOURCE_DIR
+# GMMPROC_GEN_INSTALL_DIR Top directory where installed files are searched for.
+#                         Default value: $HOME/jhbuild/install
+#
+# If you use jhbuild, you can set these environment variables equal to 
jhbuild's
+# configuration variables checkoutroot, buildroot and prefix, respectively.
+# Usually you can leave GMMPROC_GEN_SOURCE_DIR undefined.
+# If you have set buildroot=None, GMMPROC_GEN_BUILD_DIR can be undefined.
+# If you have not defined prefix in $HOME/.config/jhbuildrc, and there is no 
/opt/gnome
+# directory, GMMPROC_GEN_INSTALL_DIR can be undefined.
+
+# Generated files:
+#   skeletonmm/skeleton/src/skeleton_docs.xml
+#   skeletonmm/skeleton/src/skeleton_enums.defs
+#   skeletonmm/skeleton/src/skeleton_methods.defs
+#   skeletonmm/skeleton/src/skeleton_signals.defs
+#   skeletonmm/skeleton/src/skeleton_vfuncs.defs
+
+# Root directory of skeletonmm source files.
+root_dir="$(dirname "$0")/.."
+
+# Where to search for source files.
+if [ -z "$GMMPROC_GEN_SOURCE_DIR" ]; then
+  GMMPROC_GEN_SOURCE_DIR="$root_dir/.."
+fi
+
+# Where to search for built files.
+if [ -z "$GMMPROC_GEN_BUILD_DIR" ]; then
+  GMMPROC_GEN_BUILD_DIR="$GMMPROC_GEN_SOURCE_DIR"
+fi
+
+# Where to search for installed files.
+if [ -z "$GMMPROC_GEN_INSTALL_DIR" ]; then
+  GMMPROC_GEN_INSTALL_DIR="$HOME/jhbuild/install"
+fi
+
+# Script in glibmm. This is a source file.
+gen_docs="$GMMPROC_GEN_SOURCE_DIR/glibmm/tools/defs_gen/docextract_to_xml.py"
+
+# Where to find the executable that generates defs files from GIR files.
+gen_with_mmgir="$GMMPROC_GEN_BUILD_DIR/glibmm/tools/mmgir/mmgir"
+
+source_prefix="$GMMPROC_GEN_SOURCE_DIR/skeleton"
+build_prefix="$GMMPROC_GEN_BUILD_DIR/skeleton"
+if [ "$source_prefix" == "$build_prefix" ]; then
+  # skeleton is built with meson, which requires non-source-dir builds.
+  # This is what jhbuild does, if necessary, to force non-source-dir builds.
+  build_prefix="$build_prefix/build"
+fi
+
+gir_dir="$GMMPROC_GEN_INSTALL_DIR/share/gir-1.0"
+out_dir="$root_dir/skeleton/src"
+
+echo ===== Documentation
+params="--with-properties --no-recursion"
+for dir in "$source_prefix/skeleton" "$build_prefix/skeleton"; do
+  if [ -d "$dir" ]; then
+    params="$params -s $dir"
+  fi
+done
+"$gen_docs" $params > "$out_dir/skeleton_docs.xml"
+
+echo; echo ===== Enums, methods, signals and vfuncs
+"$gen_with_mmgir" --gir "$gir_dir"/Skeleton-1.0.gir \
+  --gir-search-dir "$gir_dir" \
+  --enum-defs "$out_dir"/skeleton_enums.defs \
+  --function-defs "$out_dir"/skeleton_methods.defs \
+  --signal-defs "$out_dir"/skeleton_signals.defs \
+  --vfunc-defs "$out_dir"/skeleton_vfuncs.defs
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mm-common-1.0.7/util/meson_aux/libstdcxx-tag.py 
new/mm-common-1.0.8/util/meson_aux/libstdcxx-tag.py
--- old/mm-common-1.0.7/util/meson_aux/libstdcxx-tag.py 2025-06-11 
11:23:04.000000000 +0200
+++ new/mm-common-1.0.8/util/meson_aux/libstdcxx-tag.py 2026-07-01 
16:08:39.000000000 +0200
@@ -2,17 +2,18 @@
 
 # External command, intended to be called with custom_target() in meson.build
 
-#                         argv[1]         argv[2]    argv[3]
-# libstdcxx-tag.py <curl-or-wget-or-none> <srcdir> <output_path>
+#                       argv[1]             argv[2]          argv[3]    argv[4]
+# libstdcxx-tag.py <use_network_opt> <curl-or-wget-or-none> <srcdir> 
<output_path>
 
 import os
 import sys
 import subprocess
 import shutil
 
-subcommand = sys.argv[1]
-srcdir = sys.argv[2]
-output_path = sys.argv[3]
+use_network_opt = sys.argv[1]
+subcommand = sys.argv[2]
+srcdir = sys.argv[3]
+output_path = sys.argv[4]
 output_dirname, output_filename = os.path.split(output_path)
 if not output_dirname:
   output_dirname = '.'
@@ -61,26 +62,45 @@
     ]
   return subprocess.run(cmd).returncode
 
-def dont_download_tag_file():
+def download_if_possible():
+  # use_network_opt == 'true' or 'if-no-local-tag-file'
+  subcommand_base = 
os.path.splitext(os.path.basename(os.path.normpath(subcommand)))[0]
+  if subcommand_base == 'curl':
+    return curl()
+  if subcommand_base == 'wget':
+    return wget()
+
+  if not os.path.isfile(output_path):
+    print('Error:', output_path, 'does not exist.', file=sys.stderr)
+    print('Downloading it is not possible because no download command exists.',
+          file=sys.stderr)
+  else:
+    print('Error: Downloading', output_path,
+          'is not possible because no download command exists.', 
file=sys.stderr)
+  print('Please install "curl" or "wget".', file=sys.stderr)
+  return 1
+
+def copy_or_download():
+  # use_network_opt == 'false' or 'if-no-local-tag-file'
   if os.path.isfile(output_path):
     print('Did not check status of', output_path, 'because network is 
disabled.')
   elif os.path.isfile(os.path.join(srcdir, output_filename)):
-    print('Warning:', output_path, 'does not exist.')
-    print('Copying from the source directory because network is disabled.')
+    print('Warning:', output_path, 'does not exist in the build directory.')
+    print('Copying from the source directory.')
     print('If you want an up-to-date copy, reconfigure with the 
-Duse-network=true option.')
     # shutil.copy2() copies timestamps and some other file metadata.
     shutil.copy2(os.path.join(srcdir, output_filename), output_path)
-  else:
+  elif use_network_opt == 'if-no-local-tag-file':
+    return download_if_possible()
+  else: # use_network_opt == 'false'
     print('Error:', output_path, 'does not exist.', file=sys.stderr)
     print('Downloading it is not possible because network is disabled.', 
file=sys.stderr)
-    print('Please reconfigure with the -Duse-network=true option.', 
file=sys.stderr)
+    print('Please reconfigure with the -Duse-network=true or',
+          '-Duse-network=if-no-local-tag-file option.', file=sys.stderr)
     return 1
   return 0
 
 # ----- Main -----
-subcommand_base = 
os.path.splitext(os.path.basename(os.path.normpath(subcommand)))[0]
-if subcommand_base == 'curl':
-  sys.exit(curl())
-if subcommand_base == 'wget':
-  sys.exit(wget())
-sys.exit(dont_download_tag_file())
+if use_network_opt == 'true':
+  sys.exit(download_if_possible())
+sys.exit(copy_or_download())

Reply via email to