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-03-16 15:43:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/obs-service-tar_scm (Old)
and /work/SRC/openSUSE:Factory/.obs-service-tar_scm.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "obs-service-tar_scm"
Tue Mar 16 15:43:47 2021 rev:65 rq:878514 version:0.10.22.1615538418.07a353d
Changes:
--------
--- /work/SRC/openSUSE:Factory/obs-service-tar_scm/obs-service-tar_scm.changes
2021-02-25 18:25:49.798113922 +0100
+++
/work/SRC/openSUSE:Factory/.obs-service-tar_scm.new.2401/obs-service-tar_scm.changes
2021-03-16 15:45:27.089137730 +0100
@@ -1,0 +2,7 @@
+Fri Mar 12 08:44:03 UTC 2021 - fschrei...@suse.com
+
+- Update to version 0.10.22.1615538418.07a353d:
+ * Fix filelist: align config(noreplace) usage with obs-service-download_files
+ * Support gitlab/github merge requests
+
+-------------------------------------------------------------------
Old:
----
obs-service-tar_scm-0.10.21.1612422695.2fdf897.tar.gz
New:
----
obs-service-tar_scm-0.10.22.1615538418.07a353d.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-tar_scm.spec ++++++
--- /var/tmp/diff_new_pack.PY8VsR/_old 2021-03-16 15:45:27.753138792 +0100
+++ /var/tmp/diff_new_pack.PY8VsR/_new 2021-03-16 15:45:27.757138799 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package obs-service-tar_scm
+# spec file for package obs-service-tar_scm-test
#
# Copyright (c) 2021 SUSE LLC
#
@@ -111,8 +111,8 @@
%define pkg_name obs-service-tar_scm
Name: %{pkg_name}%{nsuffix}
-%define version_unconverted 0.10.21.1612422695.2fdf897
-Version: 0.10.21.1612422695.2fdf897
+%define version_unconverted 0.10.22.1615538418.07a353d
+Version: 0.10.22.1615538418.07a353d
Release: 0
Summary: An OBS source service: create tar ball from svn/git/hg
License: GPL-2.0-or-later
@@ -276,7 +276,7 @@
%dir %{_sysconfdir}/obs
%dir %{_sysconfdir}/obs/services
%verify (not user group) %dir %{_sysconfdir}/obs/services/tar_scm.d
-%config(noreplace) %{_sysconfdir}/obs/services/
+%config(noreplace) %{_sysconfdir}/obs/services/*
%ghost %dir %{_sysconfdir}/obs/services/tar_scm.d/python_keyring
%files -n obs-service-tar
++++++ PKGBUILD ++++++
--- /var/tmp/diff_new_pack.PY8VsR/_old 2021-03-16 15:45:27.797138863 +0100
+++ /var/tmp/diff_new_pack.PY8VsR/_new 2021-03-16 15:45:27.801138869 +0100
@@ -1,5 +1,5 @@
pkgname=obs-service-tar_scm
-pkgver=0.10.21.1612422695.2fdf897
+pkgver=0.10.22.1615538418.07a353d
pkgrel=0
pkgdesc="Source Service for the OpenSUSE Build Service (OBS)"
arch=('any')
++++++ _multibuild ++++++
--- /var/tmp/diff_new_pack.PY8VsR/_old 2021-03-16 15:45:27.829138914 +0100
+++ /var/tmp/diff_new_pack.PY8VsR/_new 2021-03-16 15:45:27.833138921 +0100
@@ -1,3 +1,4 @@
<multibuild>
<flavor>test</flavor>
+ <flavor></flavor>
</multibuild>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.PY8VsR/_old 2021-03-16 15:45:27.869138977 +0100
+++ /var/tmp/diff_new_pack.PY8VsR/_new 2021-03-16 15:45:27.873138984 +0100
@@ -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">24d0fc541e3ba769d3aae098d3952dea275b59af</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">dfdb887643e27ed956ece3a57701ff97aa6f9d35</param></service></servicedata>
\ No newline at end of file
++++++ debian.dsc ++++++
--- /var/tmp/diff_new_pack.PY8VsR/_old 2021-03-16 15:45:27.893139016 +0100
+++ /var/tmp/diff_new_pack.PY8VsR/_new 2021-03-16 15:45:27.893139016 +0100
@@ -1,6 +1,6 @@
Format: 1.0
Source: obs-service-tar-scm
-Version: 0.10.21.1612422695.2fdf897
+Version: 0.10.22.1615538418.07a353d
Provides: obs-service-obs_scm, obs-service-tar
Binary: obs-service-tar_scm
Maintainer: Adrian Schroeter <adr...@suse.de>
++++++ obs-service-tar_scm-0.10.21.1612422695.2fdf897.tar.gz ->
obs-service-tar_scm-0.10.22.1615538418.07a353d.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.10.21.1612422695.2fdf897/TarSCM/tasks.py
new/obs-service-tar_scm-0.10.22.1615538418.07a353d/TarSCM/tasks.py
--- old/obs-service-tar_scm-0.10.21.1612422695.2fdf897/TarSCM/tasks.py
2021-02-04 08:11:35.000000000 +0100
+++ new/obs-service-tar_scm-0.10.22.1615538418.07a353d/TarSCM/tasks.py
2021-03-12 09:40:18.000000000 +0100
@@ -141,11 +141,36 @@
if rcode != 0:
raise RuntimeError("download_files has failed:%s" % output)
+ def check_for_branch_request(self, args):
+ # we may have a _branch_request file. In that case we life in a
+ # branch create by a webhook from github or gitlab pull/merge request
+ # the source supposed to be merged is more important then the code
+ # referenced in the _service file.
+ if not os.path.exists('_branch_request'):
+ return args
+
+ # is it a branch request?
+ import json
+ f = open("_branch_request", "r")
+ j = json.load(f)
+ if j['object_kind'] == 'merge_request':
+ # gitlab merge request
+ args.url = j['project']['http_url']
+ args.revision = j['object_attributes']['source']['default_branch']
+ elif j['action'] == 'opened':
+ # github pull request
+ args.url = "https://github.com/";
+ args.url += j['pull_request']['head']['repo']['full_name']
+ args.revision = j['pull_request']['head']['sha']
+
+ return args
+
+
def process_single_task(self, args):
'''
do the work for a single task
'''
- self.args = args
+ self.args = self.check_for_branch_request(args)
logging.basicConfig(format="%(message)s", stream=sys.stderr,
level=logging.INFO)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.10.21.1612422695.2fdf897/dist/obs-service-tar_scm.spec
new/obs-service-tar_scm-0.10.22.1615538418.07a353d/dist/obs-service-tar_scm.spec
---
old/obs-service-tar_scm-0.10.21.1612422695.2fdf897/dist/obs-service-tar_scm.spec
2021-02-04 08:11:35.000000000 +0100
+++
new/obs-service-tar_scm-0.10.22.1615538418.07a353d/dist/obs-service-tar_scm.spec
2021-03-12 09:40:18.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package obs-service-tar_scm
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -252,6 +252,7 @@
make install DESTDIR="%{buildroot}" PREFIX="%{_prefix}"
SYSCFG="%{_sysconfdir}" PYTHON="%{_bindir}/%{use_python}"
WITH_GBP="%{enable_gbp}"
%else
+
# moved conditional to the top as it helps to have it all in one place and
only rely on the bcond_with here.
%check
# No need to run PEP8 tests here; that would require a potentially
@@ -275,7 +276,7 @@
%dir %{_sysconfdir}/obs
%dir %{_sysconfdir}/obs/services
%verify (not user group) %dir %{_sysconfdir}/obs/services/tar_scm.d
-%config(noreplace) %{_sysconfdir}/obs/services/
+%config(noreplace) %{_sysconfdir}/obs/services/*
%ghost %dir %{_sysconfdir}/obs/services/tar_scm.d/python_keyring
%files -n obs-service-tar
