Hello community,
here is the log from the commit of package obs-service-tar_scm for
openSUSE:Factory checked in at 2020-02-03 11:10:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/obs-service-tar_scm (Old)
and /work/SRC/openSUSE:Factory/.obs-service-tar_scm.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "obs-service-tar_scm"
Mon Feb 3 11:10:54 2020 rev:57 rq:769085 version:0.10.11.1579870213.888e79c
Changes:
--------
--- /work/SRC/openSUSE:Factory/obs-service-tar_scm/obs-service-tar_scm.changes
2019-10-22 15:43:40.621595771 +0200
+++
/work/SRC/openSUSE:Factory/.obs-service-tar_scm.new.26092/obs-service-tar_scm.changes
2020-02-03 11:11:08.309778827 +0100
@@ -1,0 +2,15 @@
+Fri Jan 24 15:46:08 UTC 2020 - [email protected]
+
+- Update to version 0.10.11.1579870213.888e79c:
+ * Add testcase for appimage with empty build section
+ * Handle missing build entry in appimage.yml
+ * Fix --mirror argument position for git clone
+ * Re-enable compatibility with Python 2.6
+ * fix decoding for locale -a containg non-ASCII
+ * update_cache in git now does merge
+ * prefer local branch over remote
+ * added UnicodeDecodeError to exeption list in archive.py
+ * fetch rev explicitly if using CACHEDIRECTORY and rev could not be found
+ * tar_scm.service.in: Add example to match-tag.
+
+-------------------------------------------------------------------
Old:
----
obs-service-tar_scm-0.10.10.1566390389.9f923f8.tar.gz
New:
----
obs-service-tar_scm-0.10.11.1579870213.888e79c.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-tar_scm.spec ++++++
--- /var/tmp/diff_new_pack.prj9YJ/_old 2020-02-03 11:11:10.041779702 +0100
+++ /var/tmp/diff_new_pack.prj9YJ/_new 2020-02-03 11:11:10.045779704 +0100
@@ -1,7 +1,7 @@
#
# spec file for package obs-service-tar_scm
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -22,7 +22,7 @@
%bcond_with obs_scm_testsuite
%endif
-%if 0%{?suse_version} >= 1315 || 0%{?fedora_version} >= 29 ||
0%{?rhel_version} >= 800 || 0%{?centos_version} >= 800 || 0%{?rhel} >= 8
+%if 0%{?suse_version} >= 1315 || 0%{?fedora_version} >= 29
%bcond_without python3
%else
%bcond_with python3
@@ -53,14 +53,14 @@
%endif
%endif
-%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} ||
0%{?scientificlinux_version} || 0%{?rhel}
-%if 0%{?fedora_version} >= 29 || 0%{?rhel_version} >= 800 ||
0%{?centos_version} >= 800 || 0%{?rhel} >= 8
+%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
%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 || 0%{?rhel} >= 8
+%if 0%{?fedora_version} >= 24 || 0%{?rhel_version} >= 800 ||
0%{?centos_version} >= 800
%define locale_package glibc-langpack-en
%else
%define locale_package glibc-common
@@ -90,13 +90,13 @@
######## END OF MACROS AND FUN ###################################
Name: obs-service-tar_scm
-%define version_unconverted 0.10.10.1566390389.9f923f8
-Version: 0.10.10.1566390389.9f923f8
+%define version_unconverted 0.10.11.1579870213.888e79c
+Version: 0.10.11.1579870213.888e79c
Release: 0
Summary: An OBS source service: create tar ball from svn/git/hg
License: GPL-2.0-or-later
Group: Development/Tools/Building
-Url: https://github.com/openSUSE/obs-service-tar_scm
+URL: https://github.com/openSUSE/obs-service-tar_scm
Source: %{name}-%{version}.tar.gz
# Fix build on Ubuntu by disabling mercurial tests, not applied in rpm
++++++ PKGBUILD ++++++
--- /var/tmp/diff_new_pack.prj9YJ/_old 2020-02-03 11:11:10.069779717 +0100
+++ /var/tmp/diff_new_pack.prj9YJ/_new 2020-02-03 11:11:10.069779717 +0100
@@ -1,5 +1,5 @@
pkgname=obs-service-tar_scm
-pkgver=0.10.10.1566390389.9f923f8
+pkgver=0.10.11.1579870213.888e79c
pkgrel=0
pkgdesc="Source Service for the OpenSUSE Build Service (OBS)"
arch=('any')
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.prj9YJ/_old 2020-02-03 11:11:10.097779730 +0100
+++ /var/tmp/diff_new_pack.prj9YJ/_new 2020-02-03 11:11:10.097779730 +0100
@@ -5,4 +5,4 @@
<param
name="url">git://github.com/M0ses/obs-service-tar_scm.git</param>
<param
name="changesrevision">b742dfc0e12755cf306a95439494b5bdde7c0c61</param></service><service
name="tar_scm">
<param
name="url">git://github.com/openSUSE/obs-service-tar_scm.git</param>
- <param
name="changesrevision">9f923f8a0442e1a140c059807b4afebb8b6988d2</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">888e79c03fa4a8b3aef514176ae77c3dcdcba991</param></service></servicedata>
\ No newline at end of file
++++++ debian.dsc ++++++
--- /var/tmp/diff_new_pack.prj9YJ/_old 2020-02-03 11:11:10.109779737 +0100
+++ /var/tmp/diff_new_pack.prj9YJ/_new 2020-02-03 11:11:10.113779738 +0100
@@ -1,6 +1,6 @@
Format: 1.0
Source: obs-service-tar-scm
-Version: 0.10.10.1566390389.9f923f8
+Version: 0.10.11.1579870213.888e79c
Provides: obs-service-obs_scm, obs-service-tar
Binary: obs-service-tar_scm
Maintainer: Adrian Schroeter <[email protected]>
++++++ obs-service-tar_scm-0.10.10.1566390389.9f923f8.tar.gz ->
obs-service-tar_scm-0.10.11.1579870213.888e79c.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.10.10.1566390389.9f923f8/TarSCM/archive.py
new/obs-service-tar_scm-0.10.11.1579870213.888e79c/TarSCM/archive.py
--- old/obs-service-tar_scm-0.10.10.1566390389.9f923f8/TarSCM/archive.py
2019-08-21 14:26:29.000000000 +0200
+++ new/obs-service-tar_scm-0.10.11.1579870213.888e79c/TarSCM/archive.py
2020-01-24 13:50:13.000000000 +0100
@@ -115,7 +115,7 @@
# arg
try:
proc.stdin.write(name.encode('UTF-8', 'surrogateescape'))
- except TypeError:
+ except (TypeError, UnicodeDecodeError):
proc.stdin.write(name)
proc.stdin.write(b"\n")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.10.10.1566390389.9f923f8/TarSCM/cli.py
new/obs-service-tar_scm-0.10.11.1579870213.888e79c/TarSCM/cli.py
--- old/obs-service-tar_scm-0.10.10.1566390389.9f923f8/TarSCM/cli.py
2019-08-21 14:26:29.000000000 +0200
+++ new/obs-service-tar_scm-0.10.11.1579870213.888e79c/TarSCM/cli.py
2020-01-24 13:50:13.000000000 +0100
@@ -20,16 +20,21 @@
def check_locale(loc):
- aloc_tmp = subprocess.check_output(['locale', '-a'])
+ try:
+ aloc_tmp = subprocess.check_output(['locale', '-a'])
+ except AttributeError:
+ aloc_tmp, _ = subprocess.Popen(['locale', '-a'],
+ stdout=subprocess.PIPE,
+ stderr=subprocess.STDOUT).communicate()
aloc = dict()
- for tloc in aloc_tmp.decode().split('\n'):
+ for tloc in aloc_tmp.split(b'\n'):
aloc[tloc] = 1
for tloc in loc:
logging.debug("Checking .... %s", tloc)
try:
- if aloc[tloc]:
+ if aloc[tloc.encode()]:
return tloc
except KeyError:
pass
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.10.10.1566390389.9f923f8/TarSCM/scm/git.py
new/obs-service-tar_scm-0.10.11.1579870213.888e79c/TarSCM/scm/git.py
--- old/obs-service-tar_scm-0.10.10.1566390389.9f923f8/TarSCM/scm/git.py
2019-08-21 14:26:29.000000000 +0200
+++ new/obs-service-tar_scm-0.10.11.1579870213.888e79c/TarSCM/scm/git.py
2020-01-24 13:50:13.000000000 +0100
@@ -39,7 +39,7 @@
self.revision = 'master'
found_revision = None
- revs = [x + self.revision for x in ['origin/', '']]
+ revs = [x + self.revision for x in ['', 'origin/']]
for rev in revs:
if self._ref_exists(rev):
found_revision = True
@@ -81,7 +81,7 @@
if not self.is_sslverify_enabled():
command += ['--config', 'http.sslverify=false']
if self.repocachedir:
- command.insert(2, '--mirror')
+ command.insert(command.index('clone') + 1, '--mirror')
wdir = os.path.abspath(os.path.join(self.repodir, os.pardir))
try:
self.helpers.safe_run(
@@ -138,6 +138,11 @@
cwd=self.clone_dir,
interactive=sys.stdout.isatty()
)
+ self.helpers.safe_run(
+ self._get_scm_cmd() + ['merge'],
+ cwd=self.clone_dir,
+ interactive=sys.stdout.isatty()
+ )
self.fetch_specific_revision()
except SystemExit as exc:
@@ -308,6 +313,12 @@
self.helpers.safe_run(
command, cwd=wdir, interactive=sys.stdout.isatty())
+ if self.revision and not self._ref_exists(self.revision):
+ refspec = self.revision + ":" + self.revision
+ cmd = self._get_scm_cmd() + ['fetch', 'origin', refspec]
+ self.helpers.safe_run(
+ cmd, cwd=self.clone_dir, interactive=sys.stdout.isatty())
+
# no cleanup is necessary for git
def cleanup(self):
pass
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.10.10.1566390389.9f923f8/TarSCM/tasks.py
new/obs-service-tar_scm-0.10.11.1579870213.888e79c/TarSCM/tasks.py
--- old/obs-service-tar_scm-0.10.10.1566390389.9f923f8/TarSCM/tasks.py
2019-08-21 14:26:29.000000000 +0200
+++ new/obs-service-tar_scm-0.10.11.1579870213.888e79c/TarSCM/tasks.py
2020-01-24 13:50:13.000000000 +0100
@@ -73,7 +73,7 @@
build_scms = ()
try:
build_scms = self.data_map['build'].keys()
- except TypeError:
+ except (TypeError, KeyError):
pass
# run for each scm an own task
for scm in scms:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.10.10.1566390389.9f923f8/tar_scm.service.in
new/obs-service-tar_scm-0.10.11.1579870213.888e79c/tar_scm.service.in
--- old/obs-service-tar_scm-0.10.10.1566390389.9f923f8/tar_scm.service.in
2019-08-21 14:26:29.000000000 +0200
+++ new/obs-service-tar_scm-0.10.11.1579870213.888e79c/tar_scm.service.in
2020-01-24 13:50:13.000000000 +0100
@@ -79,8 +79,8 @@
</parameter>
<parameter name="match-tag">
<description>
- With this parameter you can specifiy a glob pattern to filter relevant
- tags in your project e.g. if you use @PARENT_TAG@
+ With this parameter you can specifiy a glob pattern (e.g. v*) to filter
+ relevant tags in your project e.g. if you use @PARENT_TAG@.
</description>
</parameter>
<parameter name="parent-tag">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.10.10.1566390389.9f923f8/tests/fixtures/TasksTestCases/test_appimage_empty_build/appimage.yml
new/obs-service-tar_scm-0.10.11.1579870213.888e79c/tests/fixtures/TasksTestCases/test_appimage_empty_build/appimage.yml
---
old/obs-service-tar_scm-0.10.10.1566390389.9f923f8/tests/fixtures/TasksTestCases/test_appimage_empty_build/appimage.yml
1970-01-01 01:00:00.000000000 +0100
+++
new/obs-service-tar_scm-0.10.11.1579870213.888e79c/tests/fixtures/TasksTestCases/test_appimage_empty_build/appimage.yml
2020-01-24 13:50:13.000000000 +0100
@@ -0,0 +1,11 @@
+app: APPIMAGE_NAME
+binpatch: true
+
+ingredients:
+ packages:
+ - RPM_PACKAGE_NAME
+
+script:
+ - cd $BUILD_APPDIR/
+ - cp $BUILD_APPDIR/usr/share/applications/NAME.desktop $BUILD_APPDIR
+ - cp $BUILD_APPDIR/usr/share/pixmaps/NAME.png $BUILD_APPDIR
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.10.10.1566390389.9f923f8/tests/gittests.py
new/obs-service-tar_scm-0.10.11.1579870213.888e79c/tests/gittests.py
--- old/obs-service-tar_scm-0.10.10.1566390389.9f923f8/tests/gittests.py
2019-08-21 14:26:29.000000000 +0200
+++ new/obs-service-tar_scm-0.10.11.1579870213.888e79c/tests/gittests.py
2020-01-24 13:50:13.000000000 +0100
@@ -7,12 +7,14 @@
import tarfile
import textwrap
import shutil
+import mock
from tests.githgtests import GitHgTests
from tests.gitsvntests import GitSvnTests
from tests.gitfixtures import GitFixtures
from tests.fake_classes import FakeCli, FakeTasks
+from TarSCM.helpers import Helpers
from TarSCM.scm.git import Git
from utils import run_git
@@ -334,3 +336,25 @@
self.tar_scm_std(*tar_scm_args)
self._check_servicedata(revision=rev, expected_dirents=3)
+
+ @mock.patch.dict(os.environ, {'http_proxy': 'http://myproxy',
+ 'CACHEDIRECTORY': '/foo'})
+ def test_git_mirror_arg_insert(self):
+ f_args = FakeCli()
+ f_tasks = FakeTasks()
+ git = Git(f_args, f_tasks)
+ git.fetch_specific_revision = mock.MagicMock()
+ git.repodir = '/tmp'
+ git.pardir = '/foo'
+ clone_url = 'https://clone_url'
+ clone_dir = '/tmp/clone_dir'
+ git.url = clone_url
+ git.clone_dir = clone_dir
+ with mock.patch.object(Helpers, 'safe_run') as mock_save_run:
+ git.fetch_upstream_scm()
+ ((command,), kwargs) = mock_save_run.call_args
+ expected_command = [
+ 'git', '-c', 'http.proxy=http://myproxy', 'clone', '--mirror',
+ clone_url, clone_dir]
+ self.assertEqual(expected_command, command)
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.10.10.1566390389.9f923f8/tests/tasks.py
new/obs-service-tar_scm-0.10.11.1579870213.888e79c/tests/tasks.py
--- old/obs-service-tar_scm-0.10.10.1566390389.9f923f8/tests/tasks.py
2019-08-21 14:26:29.000000000 +0200
+++ new/obs-service-tar_scm-0.10.11.1579870213.888e79c/tests/tasks.py
2020-01-24 13:50:13.000000000 +0100
@@ -86,6 +86,13 @@
self.assertEqual(tasks.task_list[0].__dict__[k], expected[k])
self.assertEqual(len(tasks.task_list), 1)
+ def test_appimage_empty_build(self):
+ self.cli.snapcraft = False
+ self.cli.appimage = True
+ self._cd_fixtures_dir()
+ tasks = TarSCM.Tasks(self.cli)
+ tasks.generate_list()
+
def test_appimage_empty_build_git(self):
self.cli.snapcraft = False
self.cli.appimage = True
