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 2021-07-02 13:26:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/obs-service-tar_scm (Old) and /work/SRC/openSUSE:Factory/.obs-service-tar_scm.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "obs-service-tar_scm" Fri Jul 2 13:26:22 2021 rev:67 rq:902718 version:0.10.26.1624258505.aed4969 Changes: -------- --- /work/SRC/openSUSE:Factory/obs-service-tar_scm/obs-service-tar_scm.changes 2021-06-18 10:13:40.569985512 +0200 +++ /work/SRC/openSUSE:Factory/.obs-service-tar_scm.new.2625/obs-service-tar_scm.changes 2021-07-02 13:26:29.661213430 +0200 @@ -1,0 +2,9 @@ +Mon Jun 21 07:01:03 UTC 2021 - FSchreiner@suse.com + +- Update to version 0.10.26.1624258505.aed4969: + * almalinux in spec file + * fix include filters for obscpio files + * fix python interpreter for mageia 8 + * TarScm: use owner/group root in .obscpio files + +------------------------------------------------------------------- Old: ---- obs-service-tar_scm-0.10.26.1623775884.87f49a8.tar.gz New: ---- obs-service-tar_scm-0.10.26.1624258505.aed4969.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ obs-service-tar_scm.spec ++++++ --- /var/tmp/diff_new_pack.9pWXJ7/_old 2021-07-02 13:26:30.197209271 +0200 +++ /var/tmp/diff_new_pack.9pWXJ7/_new 2021-07-02 13:26:30.197209271 +0200 @@ -16,7 +16,7 @@ # -%if 0%{?fedora_version}%{?centos_version}%{?rhel_version} +%if 0%{?fedora_version}%{?centos_version}%{?rhel_version}%{?almalinux} %define _pkg_base %nil %else %define _pkg_base -base @@ -40,7 +40,7 @@ ExclusiveArch: skip-build %endif -%if 0%{?suse_version} >= 1315 || 0%{?fedora_version} >= 29 || 0%{?centos_version} >= 800 || 0%{?rhel_version} >= 800 +%if 0%{?suse_version} >= 1315 || 0%{?fedora_version} >= 29 || 0%{?centos_version} >= 800 || 0%{?rhel_version} >= 800 || 0%{?almalinux} >= 8 %bcond_without python3 %else %bcond_with python3 @@ -71,14 +71,14 @@ %endif %endif -%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?scientificlinux_version} -%if 0%{?fedora_version} >= 29 || 0%{?rhel_version} >= 800 || 0%{?centos_version} >= 800 +%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?scientificlinux_version} || 0%{?almalinux} +%if 0%{?fedora_version} >= 29 || 0%{?rhel_version} >= 800 || 0%{?centos_version} >= 800 || 0%{?almalinux} >= 8 %define pyyaml_package %{use_python}-PyYAML %else %define pyyaml_package PyYAML %endif -%if 0%{?fedora_version} >= 24 || 0%{?rhel_version} >= 800 || 0%{?centos_version} >= 800 +%if 0%{?fedora_version} >= 24 || 0%{?rhel_version} >= 800 || 0%{?centos_version} >= 800 || 0%{?almalinux} >= 8 %define locale_package glibc-langpack-en %else %define locale_package glibc-common @@ -90,6 +90,14 @@ %define locale_package locales %endif +# Mageia 8 has package names python-* +# but requires python3 in shebang +%if 0%{?mageia} >= 8 || 0%{?centos_version} >= 800 || 0%{?rhel_version} >= 800 || 0%{?almalinux} >= 8 +%define python_path %{_bindir}/python3 +%else +%define python_path %{_bindir}/%{use_python} +%endif + # avoid code duplication %define scm_common_dep \ Requires: obs-service-obs_scm-common = %version-%release \ @@ -111,8 +119,8 @@ %define pkg_name obs-service-tar_scm Name: %{pkg_name}%{nsuffix} -%define version_unconverted 0.10.26.1623775884.87f49a8 -Version: 0.10.26.1623775884.87f49a8 +%define version_unconverted 0.10.26.1624258505.aed4969 +Version: 0.10.26.1624258505.aed4969 Release: 0 Summary: An OBS source service: create tar ball from svn/git/hg License: GPL-2.0-or-later @@ -249,7 +257,7 @@ %install %if %{without obs_scm_testsuite} -make install DESTDIR="%{buildroot}" PREFIX="%{_prefix}" SYSCFG="%{_sysconfdir}" PYTHON="%{_bindir}/%{use_python}" WITH_GBP="%{enable_gbp}" +make install DESTDIR="%{buildroot}" PREFIX="%{_prefix}" SYSCFG="%{_sysconfdir}" PYTHON="%{python_path}" WITH_GBP="%{enable_gbp}" %else ++++++ PKGBUILD ++++++ --- /var/tmp/diff_new_pack.9pWXJ7/_old 2021-07-02 13:26:30.229209023 +0200 +++ /var/tmp/diff_new_pack.9pWXJ7/_new 2021-07-02 13:26:30.233208992 +0200 @@ -1,5 +1,5 @@ pkgname=obs-service-tar_scm -pkgver=0.10.26.1623775884.87f49a8 +pkgver=0.10.26.1624258505.aed4969 pkgrel=0 pkgdesc="Source Service for the OpenSUSE Build Service (OBS)" arch=('any') ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.9pWXJ7/_old 2021-07-02 13:26:30.273208681 +0200 +++ /var/tmp/diff_new_pack.9pWXJ7/_new 2021-07-02 13:26:30.273208681 +0200 @@ -7,4 +7,4 @@ <param name="changesrevision">9e8b88b088778c44db56781e6a908a0e82e27cf2</param></service> <service name="tar_scm"> <param name="url">git://github.com/openSUSE/obs-service-tar_scm.git</param> - <param name="changesrevision">c7c1213693de8ac641c9802f260df8559467c37f</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">cd23cf15c118dbed5ac5847a1c7f627718644570</param></service></servicedata> \ No newline at end of file ++++++ debian.dsc ++++++ --- /var/tmp/diff_new_pack.9pWXJ7/_old 2021-07-02 13:26:30.293208527 +0200 +++ /var/tmp/diff_new_pack.9pWXJ7/_new 2021-07-02 13:26:30.293208527 +0200 @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-tar-scm -Version: 0.10.26.1623775884.87f49a8 +Version: 0.10.26.1624258505.aed4969 Provides: obs-service-obs_scm, obs-service-tar Binary: obs-service-tar_scm Maintainer: Adrian Schroeter <adrian@suse.de> ++++++ obs-service-tar_scm-0.10.26.1623775884.87f49a8.tar.gz -> obs-service-tar_scm-0.10.26.1624258505.aed4969.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-tar_scm-0.10.26.1623775884.87f49a8/TarSCM/archive.py new/obs-service-tar_scm-0.10.26.1624258505.aed4969/TarSCM/archive.py --- old/obs-service-tar_scm-0.10.26.1623775884.87f49a8/TarSCM/archive.py 2021-06-15 18:51:24.000000000 +0200 +++ new/obs-service-tar_scm-0.10.26.1624258505.aed4969/TarSCM/archive.py 2021-06-21 08:55:05.000000000 +0200 @@ -68,7 +68,7 @@ archivefile = open(archivefilename, "w") # detect reproducible support - params = ['cpio', '--create', '--format=newc'] + params = ['cpio', '--create', '--format=newc', '--owner', '0:0'] chkcmd = "cpio --create --format=newc --reproducible " chkcmd += "</dev/null >/dev/null 2>&1" if os.system(chkcmd) == 0: @@ -87,8 +87,9 @@ excludes = r'$.' topdir_re = '(' + topdir + '/)(' if args.include: - incl_arr = [fnmatch.translate(x) for x in args.include] - includes = topdir_re + r'|'.join(incl_arr) + ')' + incl_arr = [fnmatch.translate(x+'*') for x in args.include] + match_list = r'|'.join(incl_arr) + includes = topdir_re + match_list + ')' if args.exclude: excl_arr = [fnmatch.translate(x) for x in args.exclude] excludes = topdir_re + r'|'.join(excl_arr) + ')' @@ -223,21 +224,19 @@ out_file = os.path.join(outdir, dstname + '.' + extension) - tar = tarfile.open(out_file, "w", encoding=enc) - - try: - tar.add(topdir, recursive=False, filter=reset) - except TypeError: - # Python 2.6 compatibility - tar.add(topdir, recursive=False) - for entry in map(lambda x: os.path.join(topdir, x), - sorted(os.listdir(topdir))): + with tarfile.open(out_file, "w", encoding=enc) as tar: try: - tar.add(entry, filter=tar_filter) + tar.add(topdir, recursive=False, filter=reset) except TypeError: # Python 2.6 compatibility - tar.add(entry, exclude=tar_exclude) - tar.close() + tar.add(topdir, recursive=False) + for entry in map(lambda x: os.path.join(topdir, x), + sorted(os.listdir(topdir))): + try: + tar.add(entry, filter=tar_filter) + except TypeError: + # Python 2.6 compatibility + tar.add(entry, exclude=tar_exclude) self.archivefile = tar.name diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-tar_scm-0.10.26.1623775884.87f49a8/dist/obs-service-tar_scm.spec new/obs-service-tar_scm-0.10.26.1624258505.aed4969/dist/obs-service-tar_scm.spec --- old/obs-service-tar_scm-0.10.26.1623775884.87f49a8/dist/obs-service-tar_scm.spec 2021-06-15 18:51:24.000000000 +0200 +++ new/obs-service-tar_scm-0.10.26.1624258505.aed4969/dist/obs-service-tar_scm.spec 2021-06-21 08:55:05.000000000 +0200 @@ -16,7 +16,7 @@ # -%if 0%{?fedora_version}%{?centos_version}%{?rhel_version} +%if 0%{?fedora_version}%{?centos_version}%{?rhel_version}%{?almalinux} %define _pkg_base %nil %else %define _pkg_base -base @@ -40,7 +40,7 @@ ExclusiveArch: skip-build %endif -%if 0%{?suse_version} >= 1315 || 0%{?fedora_version} >= 29 || 0%{?centos_version} >= 800 || 0%{?rhel_version} >= 800 +%if 0%{?suse_version} >= 1315 || 0%{?fedora_version} >= 29 || 0%{?centos_version} >= 800 || 0%{?rhel_version} >= 800 || 0%{?almalinux} >= 8 %bcond_without python3 %else %bcond_with python3 @@ -71,14 +71,14 @@ %endif %endif -%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?scientificlinux_version} -%if 0%{?fedora_version} >= 29 || 0%{?rhel_version} >= 800 || 0%{?centos_version} >= 800 +%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?scientificlinux_version} || 0%{?almalinux} +%if 0%{?fedora_version} >= 29 || 0%{?rhel_version} >= 800 || 0%{?centos_version} >= 800 || 0%{?almalinux} >= 8 %define pyyaml_package %{use_python}-PyYAML %else %define pyyaml_package PyYAML %endif -%if 0%{?fedora_version} >= 24 || 0%{?rhel_version} >= 800 || 0%{?centos_version} >= 800 +%if 0%{?fedora_version} >= 24 || 0%{?rhel_version} >= 800 || 0%{?centos_version} >= 800 || 0%{?almalinux} >= 8 %define locale_package glibc-langpack-en %else %define locale_package glibc-common @@ -90,6 +90,14 @@ %define locale_package locales %endif +# Mageia 8 has package names python-* +# but requires python3 in shebang +%if 0%{?mageia} >= 8 || 0%{?centos_version} >= 800 || 0%{?rhel_version} >= 800 || 0%{?almalinux} >= 8 +%define python_path %{_bindir}/python3 +%else +%define python_path %{_bindir}/%{use_python} +%endif + # avoid code duplication %define scm_common_dep \ Requires: obs-service-obs_scm-common = %version-%release \ @@ -249,7 +257,7 @@ %install %if %{without obs_scm_testsuite} -make install DESTDIR="%{buildroot}" PREFIX="%{_prefix}" SYSCFG="%{_sysconfdir}" PYTHON="%{_bindir}/%{use_python}" WITH_GBP="%{enable_gbp}" +make install DESTDIR="%{buildroot}" PREFIX="%{_prefix}" SYSCFG="%{_sysconfdir}" PYTHON="%{python_path}" WITH_GBP="%{enable_gbp}" %else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-tar_scm-0.10.26.1623775884.87f49a8/tests/commontests.py new/obs-service-tar_scm-0.10.26.1624258505.aed4969/tests/commontests.py --- old/obs-service-tar_scm-0.10.26.1623775884.87f49a8/tests/commontests.py 2021-06-15 18:51:24.000000000 +0200 +++ new/obs-service-tar_scm-0.10.26.1624258505.aed4969/tests/commontests.py 2021-06-21 08:55:05.000000000 +0200 @@ -1,12 +1,14 @@ #!/usr/bin/env python import os +import tarfile + from pprint import pprint, pformat from tests.testassertions import TestAssertions from tests.testenv import TestEnvironment -from tests.utils import mkfreshdir +from tests.utils import mkfreshdir, run_cmd class CommonTests(TestEnvironment, TestAssertions): @@ -50,15 +52,48 @@ self.assertTrue(member.issym()) self.assertRegexpMatches(member.linkname, '[/.]*/nir/va/na$') - def test_exclude(self): + def test_tar_exclude(self): self.tar_scm_std('--exclude', 'a', '--exclude', 'c') - self.assertTarOnly(self.basename(), - tarchecker=self.assertIncludeSubdirTar) + tar = os.path.join(self.outdir, self.basename()+'.tar') + th = tarfile.open(tar) + tarents = th.getnames() + expected = [self.basename(), + self.basename() + '/subdir', + self.basename() + '/subdir/b'] + self.assertTrue(tarents == expected) - def test_include(self): + def test_tar_include(self): self.tar_scm_std('--include', self.fixtures.subdir) - self.assertTarOnly(self.basename(), - tarchecker=self.assertIncludeSubdirTar) + tar = os.path.join(self.outdir, self.basename()+'.tar') + th = tarfile.open(tar) + tarents = th.getnames() + expected = [self.basename(), + self.basename() + '/subdir', + self.basename() + '/subdir/b'] + self.assertTrue(tarents == expected) + + def test_obs_scm_exclude(self): + self.tar_scm_std('--exclude', 'a', '--exclude', 'c', '--use-obs-scm', 'True') + cpio = os.path.join(self.outdir, self.basename()+'.obscpio') + cmd = "cpio -it < "+cpio + (stdout, stderr, ret) = run_cmd(cmd) + got = stdout.decode().split("\n") + got.pop() + expected = [self.basename() + '/subdir', + self.basename() + '/subdir/b'] + self.assertTrue(got == expected) + + def test_obs_scm_include(self): + self.tar_scm_std('--include', self.fixtures.subdir, '--use-obs-scm', 'True') + cpio = os.path.join(self.outdir, self.basename()+'.obscpio') + cmd = "cpio -it < "+cpio + (stdout, stderr, ret) = run_cmd(cmd) + got = stdout.decode().split("\n") + got.pop() + expected = [self.basename() + '/subdir', + self.basename() + '/subdir/b'] + self.assertTrue(got == expected) + def test_absolute_subdir(self): (_stdout, stderr, _ret) = self.tar_scm_std_fail('--subdir', '/')