Hello community,
here is the log from the commit of package obs-service-tar_scm for
openSUSE:Factory checked in at 2018-09-04 22:49:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/obs-service-tar_scm (Old)
and /work/SRC/openSUSE:Factory/.obs-service-tar_scm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "obs-service-tar_scm"
Tue Sep 4 22:49:03 2018 rev:49 rq:632451 version:0.9.1.1534504824.0732756
Changes:
--------
--- /work/SRC/openSUSE:Factory/obs-service-tar_scm/obs-service-tar_scm.changes
2018-07-07 21:53:15.907708890 +0200
+++
/work/SRC/openSUSE:Factory/.obs-service-tar_scm.new/obs-service-tar_scm.changes
2018-09-04 22:49:06.611549334 +0200
@@ -1,0 +2,8 @@
+Fri Aug 24 06:46:28 UTC 2018 - [email protected]
+
+- Update to version 0.9.1.1534504824.0732756:
+ * changed os.removedirs -> shutil.rmtree
+ * Adding information regarding the *package-metadata* option for the *tar*
service The tar service is highly useful in combination with the *obscpio*
service. After the fix for the metadata for the latter one, it is important to
inform the users of the *tar* service that metadata is kept only if the flag
*package-metadata* is enabled. Add the flag to the .service file for mentioning
that.
+ * Allow metadata packing for CPIO archives when desired As of now, metadata
are always excluded from *obscpio* packages. This is because the
*package-metadata* flag is ignored; this change (should) make *obscpio* aware
of it.
+
+-------------------------------------------------------------------
Old:
----
obs-service-tar_scm-0.9.1.1530616709.1329314.tar.gz
New:
----
obs-service-tar_scm-0.9.1.1534504824.0732756.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-tar_scm.spec ++++++
--- /var/tmp/diff_new_pack.RYYI3r/_old 2018-09-04 22:49:07.047550834 +0200
+++ /var/tmp/diff_new_pack.RYYI3r/_new 2018-09-04 22:49:07.047550834 +0200
@@ -19,8 +19,8 @@
%bcond_without obs_scm_testsuite
Name: obs-service-tar_scm
-%define version_unconverted 0.9.1.1530616709.1329314
-Version: 0.9.1.1530616709.1329314
+%define version_unconverted 0.9.1.1534504824.0732756
+Version: 0.9.1.1534504824.0732756
Release: 0
Summary: An OBS source service: create tar ball from svn/git/hg
License: GPL-2.0-or-later
++++++ PKGBUILD ++++++
--- /var/tmp/diff_new_pack.RYYI3r/_old 2018-09-04 22:49:07.079550944 +0200
+++ /var/tmp/diff_new_pack.RYYI3r/_new 2018-09-04 22:49:07.079550944 +0200
@@ -1,5 +1,5 @@
pkgname=obs-service-tar_scm
-pkgver=0.9.0.1523267117.de861d8
+pkgver=0.9.1.1534504824.0732756
pkgrel=0
pkgdesc="Source Service for the OpenSUSE Build Service (OBS)"
arch=('any')
++++++ _service ++++++
--- /var/tmp/diff_new_pack.RYYI3r/_old 2018-09-04 22:49:07.099551012 +0200
+++ /var/tmp/diff_new_pack.RYYI3r/_new 2018-09-04 22:49:07.099551012 +0200
@@ -15,6 +15,5 @@
</service>
<service name="set_version" mode="disabled">
<param name="basename">obs-service-tar_scm</param>
- <param name="file">obs-service-tar_scm.spec</param>
</service>
</services>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.RYYI3r/_old 2018-09-04 22:49:07.111551053 +0200
+++ /var/tmp/diff_new_pack.RYYI3r/_new 2018-09-04 22:49:07.111551053 +0200
@@ -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">e6cc8b8ac6fdba7cf6fb9671d3ccc4bffb10bb0e</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">0732756ab35114049c5fb79c483d91e96217bcd8</param></service></servicedata>
\ No newline at end of file
++++++ debian.dsc ++++++
--- /var/tmp/diff_new_pack.RYYI3r/_old 2018-09-04 22:49:07.123551095 +0200
+++ /var/tmp/diff_new_pack.RYYI3r/_new 2018-09-04 22:49:07.127551109 +0200
@@ -1,6 +1,6 @@
Format: 1.0
Source: obs-service-tar-scm
-Version: 0.6.1
+Version: 0.9.1.1534504824.0732756
Provides: obs-service-obs_scm, obs-service-tar
Binary: obs-service-tar_scm
Maintainer: Adrian Schroeter <[email protected]>
++++++ obs-service-tar_scm-0.9.1.1530616709.1329314.tar.gz ->
obs-service-tar_scm-0.9.1.1534504824.0732756.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.9.1.1530616709.1329314/TarSCM/archive.py
new/obs-service-tar_scm-0.9.1.1534504824.0732756/TarSCM/archive.py
--- old/obs-service-tar_scm-0.9.1.1530616709.1329314/TarSCM/archive.py
2018-07-03 13:18:29.000000000 +0200
+++ new/obs-service-tar_scm-0.9.1.1534504824.0732756/TarSCM/archive.py
2018-08-17 13:20:24.000000000 +0200
@@ -41,11 +41,12 @@
def create_archive(self, scm_object, **kwargs):
"""Create an OBS cpio archive of repodir in destination directory.
"""
- basename = kwargs['basename']
- dstname = kwargs['dstname']
- version = kwargs['version']
- args = kwargs['cli']
- commit = scm_object.get_current_commit()
+ basename = kwargs['basename']
+ dstname = kwargs['dstname']
+ version = kwargs['version']
+ args = kwargs['cli']
+ commit = scm_object.get_current_commit()
+ package_metadata = args.package_meta
(workdir, topdir) = os.path.split(scm_object.arch_dir)
extension = 'obscpio'
@@ -81,11 +82,11 @@
files = [f for f in files if re.match(includes, f)]
for name in dirs:
- if not METADATA_PATTERN.match(name):
+ if not METADATA_PATTERN.match(name) or package_metadata:
cpiolist.append(name)
for name in files:
- if not METADATA_PATTERN.match(name):
+ if not METADATA_PATTERN.match(name) or package_metadata:
cpiolist.append(name)
tstamp = self.helpers.get_timestamp(scm_object, args, topdir)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.9.1.1530616709.1329314/TarSCM/scm/git.py
new/obs-service-tar_scm-0.9.1.1534504824.0732756/TarSCM/scm/git.py
--- old/obs-service-tar_scm-0.9.1.1530616709.1329314/TarSCM/scm/git.py
2018-07-03 13:18:29.000000000 +0200
+++ new/obs-service-tar_scm-0.9.1.1534504824.0732756/TarSCM/scm/git.py
2018-08-17 13:20:24.000000000 +0200
@@ -2,6 +2,7 @@
import os
import re
import sys
+import shutil
from TarSCM.scm.base import Scm
@@ -155,7 +156,7 @@
osc_version = os.getenv('OSC_VERSION')
if (obs_service_daemon and not osc_version):
logging.info("Removing corrupt cache!")
- os.removedirs(self.clone_dir)
+ shutil.rmtree(self.clone_dir)
self.fetch_upstream_scm()
else:
logging.info("Please fix corrupt cache directory!")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.9.1.1530616709.1329314/tar.service
new/obs-service-tar_scm-0.9.1.1534504824.0732756/tar.service
--- old/obs-service-tar_scm-0.9.1.1530616709.1329314/tar.service
2018-07-03 13:18:29.000000000 +0200
+++ new/obs-service-tar_scm-0.9.1.1534504824.0732756/tar.service
2018-08-17 13:20:24.000000000 +0200
@@ -16,4 +16,8 @@
<parameter name="extension">
<description>Specify suffix name of package, which is used together with
filename to determine tarball name.</description>
</parameter>
+ <parameter name="package-meta">
+ <description>Package the metadata of SCM to allow the user or OBS to
update after un-tar.</description>
+ <allowedvalue>yes</allowedvalue>
+ </parameter>
</service>
