Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package obs-service-tar_scm for
openSUSE:Factory checked in at 2024-08-09 16:13:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/obs-service-tar_scm (Old)
and /work/SRC/openSUSE:Factory/.obs-service-tar_scm.new.7232 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "obs-service-tar_scm"
Fri Aug 9 16:13:43 2024 rev:82 rq:1192607 version:0.10.46
Changes:
--------
--- /work/SRC/openSUSE:Factory/obs-service-tar_scm/obs-service-tar_scm.changes
2024-07-01 11:19:28.857116471 +0200
+++
/work/SRC/openSUSE:Factory/.obs-service-tar_scm.new.7232/obs-service-tar_scm.changes
2024-08-09 16:13:47.172733258 +0200
@@ -1,0 +2,53 @@
+Thu Aug 01 12:57:19 UTC 2024 - [email protected]
+
+- Update to version 0.10.46:
+ * [dist] fix BuildRequires for older distros like SLE12
+
+-------------------------------------------------------------------
+Thu Aug 01 09:48:25 UTC 2024 - [email protected]
+
+- Update to version 0.10.45:
+ * [dist] fix shebang substitution in spec for py2
+
+-------------------------------------------------------------------
+Wed Jul 31 09:20:54 UTC 2024 - [email protected]
+
+- Update to version 0.10.44:
+ * import submit request change
+ * Support updating submodules to main branch
+ * do not skip "--reference" if package-meta ...
+ * cpio: Do not follow symlinks in 'touch'
+ * Support URL hostname in keyring
+ * gbp: use --git-export
+ * Update debian/changelog for 0.10.43
+ * disable compile python in debian package
+ * update dist/debian.dsc to match debian packaging
+ * Update debian debhelper dependency
+ * Fix description-synopsis-starts-with-article
+ * Fix priority-extra-is-replaced-by-priority-optional
+ * Debian compat from 8 to 10
+ * Debian X-Python version no longer needed
+ * Fix Lintian error about missing python3 dep
+ * enable the GBP service
+ * Fixed filtering of include/exclude when topdir has escape characters.
+ * Fix setting svn credentials in the command line
+
+-------------------------------------------------------------------
+Wed Jul 31 09:06:24 UTC 2024 - Adrian Schröter <[email protected]>
+
+- update to version 0.10.44:
+ * Support updating submodules to main branch
+ * Debian packaging for gbp service
+ * do not skip "--reference" if package-meta is enabled and git's partial
clone is used.
+ * Fixed filtering of include/exclude when topdir has escape characters.
+ * Fix setting svn credentials in the command line
+ * cpio: Do not follow symlinks in 'touch'
+ * Support URL hostname in keyring
+ * debian package updates
+
+-------------------------------------------------------------------
+Thu Jul 25 19:52:48 UTC 2024 - Bjørn Lie <[email protected]>
+
+- "Downgrade" bzr, mercurial and subversion Recommends to Suggests.
+
+-------------------------------------------------------------------
Old:
----
obs-service-tar_scm-0.10.43.tar.gz
New:
----
obs-service-tar_scm-0.10.46.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-tar_scm.spec ++++++
--- /var/tmp/diff_new_pack.M1VrYh/_old 2024-08-09 16:13:48.888804886 +0200
+++ /var/tmp/diff_new_pack.M1VrYh/_new 2024-08-09 16:13:48.892805053 +0200
@@ -106,12 +106,12 @@
%define scm_dependencies \
Requires: git-core \
%if 0%{?suse_version} >= 1315 \
-Recommends: bzr \
-Recommends: mercurial \
-Recommends: subversion \
Recommends: obs-service-download_files \
Recommends: %{use_python}-keyring \
Recommends: %{use_python}-keyrings.alt \
+Suggests: bzr \
+Suggests: mercurial \
+Suggests: subversion \
%endif \
%{nil}
@@ -119,8 +119,8 @@
%define pkg_name obs-service-tar_scm
Name: %{pkg_name}%{nsuffix}
-%define version_unconverted 0.10.43
-Version: 0.10.43
+%define version_unconverted 0.10.46
+Version: 0.10.46
Release: 0
Summary: An OBS source service: create tar ball from svn/git/hg
License: GPL-2.0-or-later
@@ -161,6 +161,9 @@
BuildRequires: %{use_python}%{_pkg_base}
# Fix missing Requires in python3-pbr in Leap42.3
BuildRequires: %{use_python}-setuptools
+%if 0%{?suse_version}
+BuildRequires: python-rpm-macros
+%endif
%else
BuildRequires: python >= 2.6
%endif
@@ -261,10 +264,11 @@
%install
%if %{without obs_scm_testsuite}
make install DESTDIR="%{buildroot}" PREFIX="%{_prefix}"
SYSCFG="%{_sysconfdir}" PYTHON="%{python_path}" WITH_GBP="%{enable_gbp}"
+%if %{with python3}
# Doing %%python3_fix_shebang_path old fashioned way for the backward
compatibility
sed -i "1s@#\\!.*python\S*@#\\!$(realpath %__python3)@" \
%{buildroot}%{_prefix}/lib/obs/service/tar_scm
-
+%endif
%else
# moved conditional to the top as it helps to have it all in one place and
only rely on the bcond_with here.
++++++ PKGBUILD ++++++
--- /var/tmp/diff_new_pack.M1VrYh/_old 2024-08-09 16:13:48.928806556 +0200
+++ /var/tmp/diff_new_pack.M1VrYh/_new 2024-08-09 16:13:48.928806556 +0200
@@ -1,5 +1,5 @@
pkgname=obs-service-tar_scm
-pkgver=0.10.43
+pkgver=0.10.46
pkgrel=0
pkgdesc="Source Service for the OpenSUSE Build Service (OBS)"
arch=('any')
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.M1VrYh/_old 2024-08-09 16:13:48.992809227 +0200
+++ /var/tmp/diff_new_pack.M1VrYh/_new 2024-08-09 16:13:48.996809394 +0200
@@ -12,7 +12,7 @@
</service>
<service name="tar_scm">
<param
name="url">https://github.com/openSUSE/obs-service-tar_scm.git</param>
- <param
name="changesrevision">9df35c1e38f8dc4a7a90cb3fef84bd9b9f5755c4</param>
+ <param
name="changesrevision">b8058dced0c2422a5905348647edc65baef0efa5</param>
</service>
</servicedata>
(No newline at EOF)
++++++ debian.dsc ++++++
--- /var/tmp/diff_new_pack.M1VrYh/_old 2024-08-09 16:13:49.020810396 +0200
+++ /var/tmp/diff_new_pack.M1VrYh/_new 2024-08-09 16:13:49.024810563 +0200
@@ -1,18 +1,18 @@
Format: 1.0
Source: obs-service-tar-scm
-Version: 0.10.43
-Provides: obs-service-obs_scm, obs-service-tar
+Version: 0.10.46
+Provides: obs-service-obs_scm, obs-service-tar, obs-service-gbp
Binary: obs-service-tar_scm
Maintainer: Adrian Schroeter <[email protected]>
Architecture: all
-Standards-Version: 3.7.2
+Standards-Version: 3.9.3
Build-Depends: debhelper (>= 8.0.0), python3, python3-dateutil, dh-python,
python3-yaml
Package: obs-service-tar-scm
Architecture: all
Provides: obs-service-obs-scm, obs-service-tar
-Depends: ${misc:Depends}, ${python3:Depends}, bzr, git, subversion, cpio,
python3-dateutil, python3-yaml
-Recommends: mercurial
+Depends: ${misc:Depends}, ${python3:Depends}, python3, bzr, git, subversion,
cpio, python3-dateutil, python3-yaml
+Recommends: mercurial, git-buildpackage, git-lfs
Description: An OBS source service: fetches SCM tarballs
This is a source service for openSUSE Build Service.
It supports downloading from svn, git, hg and bzr repositories.
++++++ obs-service-tar_scm-0.10.43.tar.gz -> obs-service-tar_scm-0.10.46.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-tar_scm-0.10.43/GNUmakefile
new/obs-service-tar_scm-0.10.46/GNUmakefile
--- old/obs-service-tar_scm-0.10.43/GNUmakefile 2024-02-21 11:46:22.000000000
+0100
+++ new/obs-service-tar_scm-0.10.46/GNUmakefile 2024-08-01 14:39:20.000000000
+0200
@@ -172,9 +172,11 @@
@echo "Creating $@ which uses $(PYTHON) ..."
sed 's,^\#!/usr/bin/.*,#!$(PYTHON),' $< > $@
+COMPILED_PYTHON = true
+
.PHONY: install
-install: dirs tar_scm service compile
+install: dirs tar_scm service $(if $(findstring
$(COMPILED_PYTHON),true),compile)
install -m 0755 tar_scm $(DESTDIR)$(mylibdir)/tar_scm
install -m 0644 tar_scm.rc $(DESTDIR)$(mycfgdir)/tar_scm
# Recreate links, otherwise reinstalling would fail
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-tar_scm-0.10.43/TarSCM/archive.py
new/obs-service-tar_scm-0.10.46/TarSCM/archive.py
--- old/obs-service-tar_scm-0.10.43/TarSCM/archive.py 2024-02-21
11:46:22.000000000 +0100
+++ new/obs-service-tar_scm-0.10.46/TarSCM/archive.py 2024-08-01
14:39:20.000000000 +0200
@@ -85,7 +85,7 @@
# transform glob patterns to regular expressions
includes = ''
excludes = r'$.'
- topdir_re = '(' + topdir + '/)('
+ topdir_re = '(' + re.escape(topdir) + '/)('
if args.include:
incl_arr = [fnmatch.translate(x + '*') for x in args.include]
match_list = r'|'.join(incl_arr)
@@ -118,7 +118,7 @@
tstamp = self.helpers.get_timestamp(scm_object, args, topdir)
for name in sorted(cpiolist):
try:
- os.utime(name, (tstamp, tstamp))
+ os.utime(name, (tstamp, tstamp), follow_symlinks=False)
except OSError:
pass
# bytes() break in python2 with a TypeError as it expects only 1
@@ -256,18 +256,14 @@
cwd = os.getcwd()
os.chdir(workdir)
- if not args.revision:
- revision = 'origin/master'
- else:
- revision = 'origin/' + args.revision
-
command = ['gbp', 'buildpackage', '--git-notify=off',
'--git-force-create', '--git-cleaner="true"']
# we are not on a proper local branch due to using git-reset but we
# anyway use the --git-export option
command.extend(['--git-ignore-branch',
- "--git-export=%s" % revision])
+ "--git-export-dir=%s" % workdir,
+ '--git-export=WC'])
# gbp can load submodules without having to run the git command, and
# will ignore submodules even if loaded manually unless this option is
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-tar_scm-0.10.43/TarSCM/cli.py
new/obs-service-tar_scm-0.10.46/TarSCM/cli.py
--- old/obs-service-tar_scm-0.10.43/TarSCM/cli.py 2024-02-21
11:46:22.000000000 +0100
+++ new/obs-service-tar_scm-0.10.46/TarSCM/cli.py 2024-08-01
14:39:20.000000000 +0200
@@ -127,12 +127,13 @@
parser.add_argument('--subdir', default='',
help='Package just a subdirectory of the sources')
parser.add_argument('--submodules',
- choices=['enable', 'master', 'disable'],
+ choices=['enable', 'master', 'main', 'disable'],
default='enable',
help='Whether or not to include git submodules '
'from SCM commit log since a given parent '
'revision (see changesrevision). Use '
- '\'master\' to fetch the latest master.')
+ '\'master\' or \'main\' to fetch the latest'
+ 'development revision.')
parser.add_argument('--lfs',
choices=['enable', 'disable'],
default='disable',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-tar_scm-0.10.43/TarSCM/scm/base.py
new/obs-service-tar_scm-0.10.46/TarSCM/scm/base.py
--- old/obs-service-tar_scm-0.10.43/TarSCM/scm/base.py 2024-02-21
11:46:22.000000000 +0100
+++ new/obs-service-tar_scm-0.10.46/TarSCM/scm/base.py 2024-08-01
14:39:20.000000000 +0200
@@ -68,8 +68,13 @@
try:
self.password = _kr.get_password(self.url, args.user)
if not self.password:
- raise Exception('No user {u} in keyring for service {s}'
- .format(u=args.user, s=self.url))
+ # try just the hostname
+ url_netloc = urlparse(self.url)[1]
+ self.password = _kr.get_password(url_netloc, args.user)
+ if not self.password:
+ raise Exception(
+ 'No user {u} in keyring for service {s}'
+ .format(u=args.user, s=self.url))
except AssertionError:
raise Exception('Wrong keyring passphrase')
self.user = args.user
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-tar_scm-0.10.43/TarSCM/scm/git.py
new/obs-service-tar_scm-0.10.46/TarSCM/scm/git.py
--- old/obs-service-tar_scm-0.10.43/TarSCM/scm/git.py 2024-02-21
11:46:22.000000000 +0100
+++ new/obs-service-tar_scm-0.10.46/TarSCM/scm/git.py 2024-08-01
14:39:20.000000000 +0200
@@ -201,7 +201,8 @@
'--recursive'],
cwd=self.clone_dir
)
- elif 'submodules' in argsd and argsd['submodules'] == 'master':
+ elif 'submodules' in argsd and \
+ argsd['submodules'] in ['main', 'master']:
self.helpers.safe_run(
self._get_scm_cmd() + ['submodule', 'update', '--init',
'--recursive', '--remote'],
@@ -421,7 +422,7 @@
use_reference = True
try:
- if self.args.package_meta:
+ if (self.args.package_meta and not self.partial_clone):
logging.info("Not using '--reference'")
use_reference = False
except KeyError:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-tar_scm-0.10.43/TarSCM/scm/svn.py
new/obs-service-tar_scm-0.10.46/TarSCM/scm/svn.py
--- old/obs-service-tar_scm-0.10.43/TarSCM/scm/svn.py 2024-02-21
11:46:22.000000000 +0100
+++ new/obs-service-tar_scm-0.10.46/TarSCM/scm/svn.py 2024-08-01
14:39:20.000000000 +0200
@@ -76,9 +76,9 @@
cfg.close()
scmcmd += ['--config-dir', self.svntmpdir]
- if self.user and self.password:
- scmcmd += ['--username', self.user]
- scmcmd += ['--password', self.password]
+ if self.user and self.password:
+ scmcmd += ['--username', self.user]
+ scmcmd += ['--password', self.password]
return scmcmd
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-tar_scm-0.10.43/appimage.service
new/obs-service-tar_scm-0.10.46/appimage.service
--- old/obs-service-tar_scm-0.10.43/appimage.service 2024-02-21
11:46:22.000000000 +0100
+++ new/obs-service-tar_scm-0.10.46/appimage.service 2024-08-01
14:39:20.000000000 +0200
@@ -2,9 +2,10 @@
<summary>handle sources specified in appimage.yml</summary>
<description>This service needs to be executed to download sources according
to appimage.yml file</description>
<parameter name="submodules">
- <description>Specify whether to include git submodules. Default is
'enable'.</description>
+ <description>Specify whether to include git submodules. Default is
'enable'. main or master is override the specified commit with master or main
branch.</description>
<allowedvalue>enable</allowedvalue>
<allowedvalue>master</allowedvalue>
+ <allowedvalue>main</allowedvalue>
<allowedvalue>disable</allowedvalue>
</parameter>
<parameter name="lfs">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-tar_scm-0.10.43/debian/changelog
new/obs-service-tar_scm-0.10.46/debian/changelog
--- old/obs-service-tar_scm-0.10.43/debian/changelog 2024-02-21
11:46:22.000000000 +0100
+++ new/obs-service-tar_scm-0.10.46/debian/changelog 2024-08-01
14:39:20.000000000 +0200
@@ -1,3 +1,22 @@
+obs-service-tar-scm (0.10.43) unstable; urgency=medium
+
+ [ Adrian Schröter ]
+ * Allow to use "tar" service also standalone.
+ * fix tar without obsinfo also in git managed packages
+
+ [ Nicholas Brown ]
+ * enable the GBP service
+ * Fix Lintian error about missing python3 dep
+ * Debian X-Python version no longer needed
+ * Debian compat from 8 to 10
+ * Fix priority-extra-is-replaced-by-priority-optional
+ * Fix description-synopsis-starts-with-article
+ * Update debian debhelper dependency
+ * update dist/debian.dsc to match debian packaging
+ * disable compile python in debian package
+
+ -- Nick Brown <[email protected]> Thu, 29 Feb 2024 15:51:56 +0000
+
obs-service-tar-scm (0.10.41) unstable; urgency=medium
* update to upstream version 0.10.41
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-tar_scm-0.10.43/debian/compat
new/obs-service-tar_scm-0.10.46/debian/compat
--- old/obs-service-tar_scm-0.10.43/debian/compat 2024-02-21
11:46:22.000000000 +0100
+++ new/obs-service-tar_scm-0.10.46/debian/compat 2024-08-01
14:39:20.000000000 +0200
@@ -1 +1 @@
-8
+10
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-tar_scm-0.10.43/debian/control
new/obs-service-tar_scm-0.10.46/debian/control
--- old/obs-service-tar_scm-0.10.43/debian/control 2024-02-21
11:46:22.000000000 +0100
+++ new/obs-service-tar_scm-0.10.46/debian/control 2024-08-01
14:39:20.000000000 +0200
@@ -1,17 +1,16 @@
Source: obs-service-tar-scm
Section: devel
-Priority: extra
+Priority: optional
Maintainer: Daniel Gollub <[email protected]>
-Build-Depends: debhelper (>= 7.0.0), python3, python3-dateutil, dh-python
+Build-Depends: debhelper (>= 8.0.0), python3, python3-dateutil, dh-python
Standards-Version: 3.9.3
Homepage: https://github.com/openSUSE/obs-service-tar_scm
-X-Python-Version: >= 2.6
Package: obs-service-tar-scm
Architecture: all
-Provides: obs-service-obs-scm, obs-service-tar
-Depends: ${misc:Depends}, ${python3:Depends}, bzr, git, subversion, cpio,
python3-dateutil, python3-yaml, locales-all
+Provides: obs-service-obs-scm, obs-service-tar, obs-service-gbp
+Depends: ${misc:Depends}, ${python3:Depends}, python3, bzr, git, subversion,
cpio, python3-dateutil, python3-yaml, locales-all
Recommends: mercurial, git-buildpackage, git-lfs
-Description: An OBS source service: fetches SCM tarballs
+Description: OBS source service: fetches SCM tarballs
This is a source service for openSUSE Build Service.
It supports downloading from svn, git, hg and bzr repositories.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-tar_scm-0.10.43/debian/rules
new/obs-service-tar_scm-0.10.46/debian/rules
--- old/obs-service-tar_scm-0.10.43/debian/rules 2024-02-21
11:46:22.000000000 +0100
+++ new/obs-service-tar_scm-0.10.46/debian/rules 2024-08-01
14:39:20.000000000 +0200
@@ -7,9 +7,11 @@
%:
dh $@ --with python3
-override_dh_auto_build: ;
+# Skip the Makefile and just rely on the python debhelper
+override_dh_auto_build:
-override_dh_auto_test: ;
+# Skip tests as slow and don't detect python on debian
+override_dh_auto_test:
override_dh_auto_install:
- $(MAKE) DESTDIR=`pwd`/$(DESTDIR) PREFIX=/usr install
+ dh_auto_install -- COMPILED_PYTHON=false WITH_GBP=1 install
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-tar_scm-0.10.43/dist/debian.dsc
new/obs-service-tar_scm-0.10.46/dist/debian.dsc
--- old/obs-service-tar_scm-0.10.43/dist/debian.dsc 2024-02-21
11:46:22.000000000 +0100
+++ new/obs-service-tar_scm-0.10.46/dist/debian.dsc 2024-08-01
14:39:20.000000000 +0200
@@ -1,18 +1,18 @@
Format: 1.0
Source: obs-service-tar-scm
-Version: 0.10.36
-Provides: obs-service-obs_scm, obs-service-tar
+Version: 0.10.43
+Provides: obs-service-obs_scm, obs-service-tar, obs-service-gbp
Binary: obs-service-tar_scm
Maintainer: Adrian Schroeter <[email protected]>
Architecture: all
-Standards-Version: 3.7.2
+Standards-Version: 3.9.3
Build-Depends: debhelper (>= 8.0.0), python3, python3-dateutil, dh-python,
python3-yaml
Package: obs-service-tar-scm
Architecture: all
Provides: obs-service-obs-scm, obs-service-tar
-Depends: ${misc:Depends}, ${python3:Depends}, bzr, git, subversion, cpio,
python3-dateutil, python3-yaml
-Recommends: mercurial
+Depends: ${misc:Depends}, ${python3:Depends}, python3, bzr, git, subversion,
cpio, python3-dateutil, python3-yaml
+Recommends: mercurial, git-buildpackage, git-lfs
Description: An OBS source service: fetches SCM tarballs
This is a source service for openSUSE Build Service.
It supports downloading from svn, git, hg and bzr repositories.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.10.43/dist/obs-service-tar_scm.spec
new/obs-service-tar_scm-0.10.46/dist/obs-service-tar_scm.spec
--- old/obs-service-tar_scm-0.10.43/dist/obs-service-tar_scm.spec
2024-02-21 11:46:22.000000000 +0100
+++ new/obs-service-tar_scm-0.10.46/dist/obs-service-tar_scm.spec
2024-08-01 14:39:20.000000000 +0200
@@ -161,6 +161,9 @@
BuildRequires: %{use_python}%{_pkg_base}
# Fix missing Requires in python3-pbr in Leap42.3
BuildRequires: %{use_python}-setuptools
+%if 0%{?suse_version}
+BuildRequires: python-rpm-macros \
+%endif
%else
BuildRequires: python >= 2.6
%endif
@@ -261,7 +264,11 @@
%install
%if %{without obs_scm_testsuite}
make install DESTDIR="%{buildroot}" PREFIX="%{_prefix}"
SYSCFG="%{_sysconfdir}" PYTHON="%{python_path}" WITH_GBP="%{enable_gbp}"
-
+%if %{with python3}
+# Doing %%python3_fix_shebang_path old fashioned way for the backward
compatibility
+sed -i "1s@#\\!.*python\S*@#\\!$(realpath %__python3)@" \
+ %{buildroot}%{_prefix}/lib/obs/service/tar_scm
+%endif
%else
# moved conditional to the top as it helps to have it all in one place and
only rely on the bcond_with here.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-tar_scm-0.10.43/snapcraft.service
new/obs-service-tar_scm-0.10.46/snapcraft.service
--- old/obs-service-tar_scm-0.10.43/snapcraft.service 2024-02-21
11:46:22.000000000 +0100
+++ new/obs-service-tar_scm-0.10.46/snapcraft.service 2024-08-01
14:39:20.000000000 +0200
@@ -2,9 +2,10 @@
<summary>handle sources specified in snapcraft.yaml</summary>
<description>This service needs to be executed to download sources according
to snapcraft.yaml file. It also patches the snapcraft tile to use local sources
during build.</description>
<parameter name="submodules">
- <description>Specify whether to include git submodules. Default is
'enable'.</description>
+ <description>Specify whether to include git submodules. Default is
'enable'. main or master is override the specified commit with master or main
branch.</description>
<allowedvalue>enable</allowedvalue>
<allowedvalue>master</allowedvalue>
+ <allowedvalue>main</allowedvalue>
<allowedvalue>disable</allowedvalue>
</parameter>
<parameter name="lfs">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-tar_scm-0.10.43/tar_scm.service.in
new/obs-service-tar_scm-0.10.46/tar_scm.service.in
--- old/obs-service-tar_scm-0.10.43/tar_scm.service.in 2024-02-21
11:46:22.000000000 +0100
+++ new/obs-service-tar_scm-0.10.46/tar_scm.service.in 2024-08-01
14:39:20.000000000 +0200
@@ -172,9 +172,10 @@
<description>Obsolete parameter which will be ignored.</description>
</parameter>
<parameter name="submodules">
- <description>Specify whether to include git submodules. Default is
'enable'.</description>
+ <description>Specify whether to include git submodules. Default is
'enable'. main or master is override the specified commit with master or main
branch.</description>
<allowedvalue>enable</allowedvalue>
<allowedvalue>master</allowedvalue>
+ <allowedvalue>main</allowedvalue>
<allowedvalue>disable</allowedvalue>
</parameter>
===OBS_ONLY
