Hello community,
here is the log from the commit of package obs-service-tar_scm for
openSUSE:Factory checked in at 2017-10-18 12:49:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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"
Wed Oct 18 12:49:38 2017 rev:45 rq:533590 version:0.8.0.1507129410.0cb2d44
Changes:
--------
--- /work/SRC/openSUSE:Factory/obs-service-tar_scm/obs-service-tar_scm.changes
2017-07-21 22:48:48.245765548 +0200
+++
/work/SRC/openSUSE:Factory/.obs-service-tar_scm.new/obs-service-tar_scm.changes
2017-10-18 12:49:45.061273674 +0200
@@ -1,0 +2,12 @@
+Wed Oct 11 06:48:27 UTC 2017 - [email protected]
+
+- Update to version 0.8.0.1507129410.0cb2d44:
+ * mention _none_ version string for people who need it for kiwi root
archives for example
+ * git: Support url change
+ * change ordering so that latest change is on top
+ * also override timestamps of files in cpio
+ * Sort cpio file list
+ * [dist] fix spec file py_compile for fedora
+ * Sort tar file list
+
+-------------------------------------------------------------------
Old:
----
obs-service-tar_scm-0.8.0.1499787575.2419460.tar.gz
New:
----
PKGBUILD
obs-service-tar_scm-0.8.0.1507129410.0cb2d44.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-tar_scm.spec ++++++
--- /var/tmp/diff_new_pack.6PhSZL/_old 2017-10-18 12:49:47.169174949 +0200
+++ /var/tmp/diff_new_pack.6PhSZL/_new 2017-10-18 12:49:47.173174761 +0200
@@ -19,8 +19,8 @@
%bcond_without obs_scm_testsuite
Name: obs-service-tar_scm
-%define version_unconverted 0.8.0.1499787575.2419460
-Version: 0.8.0.1499787575.2419460
+%define version_unconverted 0.8.0.1507129410.0cb2d44
+Version: 0.8.0.1507129410.0cb2d44
Release: 0
Summary: An OBS source service: create tar ball from svn/git/hg
License: GPL-2.0+
@@ -35,6 +35,14 @@
BuildRequires: git-core
BuildRequires: mercurial
%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
+%define py_compile(O) \
+find %1 -name '*.pyc' -exec rm -f {} \\; \
+python -c "import sys, os, compileall; br='%{buildroot}';
compileall.compile_dir(sys.argv[1], ddir=br and
(sys.argv[1][len(os.path.abspath(br)):]+'/') or None)" %1 \
+%{-O: \
+find %1 -name '*.pyo' -exec rm -f {} \\; \
+python -O -c "import sys, os, compileall; br='%{buildroot}';
compileall.compile_dir(sys.argv[1], ddir=br and
(sys.argv[1][len(os.path.abspath(br)):]+'/') or None)" %1 \
+}
+
BuildRequires: PyYAML
%else
BuildRequires: python-PyYAML
@@ -135,7 +143,11 @@
%setup -q -n obs-service-tar_scm-%version
%build
+%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
+%py_compile .
+%else
%py_compile %{buildroot}
+%endif
%install
make install DESTDIR="%{buildroot}" PREFIX="%{_prefix}" SYSCFG="%{_sysconfdir}"
++++++ PKGBUILD ++++++
pkgname=obs-service-tar_scm
pkgver=0.8.0.1507129410.0cb2d44
pkgrel=0
pkgdesc="Source Service for the OpenSUSE Build Service (OBS)"
arch=('any')
url="https://github.com/openSUSE/obs-service-tar_scm";
license=('GPL3')
groups=('base-devel')
makedepends=('python2' 'python2-yaml' 'python2-dateutil' 'python2-lxml'
'python2-mock' 'python2-unittest2' 'bzr' 'git' 'mercurial' 'subversion' )
depends=('python2' 'python2-yaml' 'python2-dateutil' 'python2-argparse' 'cpio'
'git' 'bzr' 'mercurial' 'subversion' )
source=("obs-service-tar_scm-${pkgver}.tar.gz::https://github.com/openSUSE/obs-service-tar_scm/archive/v${pkgver}.tar.gz";)
provides=('obs-service-tar')
sha256sums=('SKIP')
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" PREFIX=/usr install
}
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.6PhSZL/_old 2017-10-18 12:49:47.237171764 +0200
+++ /var/tmp/diff_new_pack.6PhSZL/_new 2017-10-18 12:49:47.237171764 +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">af556cadb955aa9872293ea8d738d60f065e592c</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">750affe3712d0fccfbc7b9cab03d278de28f5543</param></service></servicedata>
\ No newline at end of file
++++++ obs-service-tar_scm-0.8.0.1499787575.2419460.tar.gz ->
obs-service-tar_scm-0.8.0.1507129410.0cb2d44.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.8.0.1499787575.2419460/TarSCM/archive.py
new/obs-service-tar_scm-0.8.0.1507129410.0cb2d44/TarSCM/archive.py
--- old/obs-service-tar_scm-0.8.0.1499787575.2419460/TarSCM/archive.py
2017-07-11 17:39:35.000000000 +0200
+++ new/obs-service-tar_scm-0.8.0.1507129410.0cb2d44/TarSCM/archive.py
2017-10-04 17:03:30.000000000 +0200
@@ -69,6 +69,7 @@
excludes = r'|'.join(excl_arr) or r'$.'
# add topdir without filtering for now
+ cpiolist = []
for root, dirs, files in os.walk(topdir, topdown=False):
# excludes
dirs[:] = [os.path.join(root, d) for d in dirs]
@@ -81,14 +82,17 @@
for name in dirs:
if not METADATA_PATTERN.match(name):
- proc.stdin.write(name)
- proc.stdin.write("\n")
+ cpiolist.append(name)
for name in files:
if not METADATA_PATTERN.match(name):
- proc.stdin.write(name)
- proc.stdin.write("\n")
+ cpiolist.append(name)
+ tstamp = self.helpers.get_timestamp(scm_object, args, topdir)
+ for name in sorted(cpiolist):
+ os.utime(name, (tstamp, tstamp))
+ proc.stdin.write(name)
+ proc.stdin.write("\n")
proc.stdin.close()
ret_code = proc.wait()
if ret_code != 0:
@@ -99,7 +103,6 @@
metafile = open(os.path.join(args.outdir, basename + '.obsinfo'), "w")
metafile.write("name: " + basename + "\n")
metafile.write("version: " + version + "\n")
- tstamp = self.helpers.get_timestamp(scm_object, args, topdir)
metafile.write("mtime: " + str(tstamp) + "\n")
if commit:
@@ -190,7 +193,7 @@
# Python 2.6 compatibility
tar.add(topdir, recursive=False)
for entry in map(lambda x: os.path.join(topdir, x),
- os.listdir(topdir)):
+ sorted(os.listdir(topdir))):
try:
tar.add(entry, filter=tar_filter)
except TypeError:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.8.0.1499787575.2419460/TarSCM/scm/git.py
new/obs-service-tar_scm-0.8.0.1507129410.0cb2d44/TarSCM/scm/git.py
--- old/obs-service-tar_scm-0.8.0.1499787575.2419460/TarSCM/scm/git.py
2017-07-11 17:39:35.000000000 +0200
+++ new/obs-service-tar_scm-0.8.0.1507129410.0cb2d44/TarSCM/scm/git.py
2017-10-04 17:03:30.000000000 +0200
@@ -102,6 +102,13 @@
def update_cache(self):
"""Update sources via git."""
+ # Force origin to the wanted URL in case it switched
+ self.helpers.safe_run(
+ ['git', 'config', 'remote.origin.url', self.url],
+ cwd=self.clone_dir,
+ interactive=sys.stdout.isatty()
+ )
+
self.helpers.safe_run(
['git', 'fetch', '--tags'],
cwd=self.clone_dir,
@@ -234,7 +241,7 @@
logging.debug(dbg_msg)
- lines = self._log_cmd(['--reverse', '--no-merges',
+ lines = self._log_cmd(['--no-merges',
'--pretty=format:%s',
"%s..%s" % (last_rev, current_rev)],
subdir)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.8.0.1499787575.2419460/TarSCM/scm/svn.py
new/obs-service-tar_scm-0.8.0.1507129410.0cb2d44/TarSCM/scm/svn.py
--- old/obs-service-tar_scm-0.8.0.1499787575.2419460/TarSCM/scm/svn.py
2017-07-11 17:39:35.000000000 +0200
+++ new/obs-service-tar_scm-0.8.0.1507129410.0cb2d44/TarSCM/scm/svn.py
2017-10-04 17:03:30.000000000 +0200
@@ -102,7 +102,7 @@
new_lines = []
xml_lines = self.helpers.safe_run(
- ['svn', 'log', '-r%s:%s' % (revision1, revision2), '--xml'],
+ ['svn', 'log', '-r%s:%s' % (revision2, revision1), '--xml'],
clone_dir
)[1]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.8.0.1499787575.2419460/dist/obs-service-tar_scm.spec
new/obs-service-tar_scm-0.8.0.1507129410.0cb2d44/dist/obs-service-tar_scm.spec
---
old/obs-service-tar_scm-0.8.0.1499787575.2419460/dist/obs-service-tar_scm.spec
2017-07-11 17:39:35.000000000 +0200
+++
new/obs-service-tar_scm-0.8.0.1507129410.0cb2d44/dist/obs-service-tar_scm.spec
2017-10-04 17:03:30.000000000 +0200
@@ -35,6 +35,14 @@
BuildRequires: git-core
BuildRequires: mercurial
%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
+%define py_compile(O) \
+find %1 -name '*.pyc' -exec rm -f {} \\; \
+python -c "import sys, os, compileall; br='%{buildroot}';
compileall.compile_dir(sys.argv[1], ddir=br and
(sys.argv[1][len(os.path.abspath(br)):]+'/') or None)" %1 \
+%{-O: \
+find %1 -name '*.pyo' -exec rm -f {} \\; \
+python -O -c "import sys, os, compileall; br='%{buildroot}';
compileall.compile_dir(sys.argv[1], ddir=br and
(sys.argv[1][len(os.path.abspath(br)):]+'/') or None)" %1 \
+}
+
BuildRequires: PyYAML
%else
BuildRequires: python-PyYAML
@@ -135,7 +143,11 @@
%setup -q -n obs-service-tar_scm-%version
%build
+%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
+%py_compile .
+%else
%py_compile %{buildroot}
+%endif
%install
make install DESTDIR="%{buildroot}" PREFIX="%{_prefix}" SYSCFG="%{_sysconfdir}"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.8.0.1499787575.2419460/tar.service
new/obs-service-tar_scm-0.8.0.1507129410.0cb2d44/tar.service
--- old/obs-service-tar_scm-0.8.0.1499787575.2419460/tar.service
2017-07-11 17:39:35.000000000 +0200
+++ new/obs-service-tar_scm-0.8.0.1507129410.0cb2d44/tar.service
2017-10-04 17:03:30.000000000 +0200
@@ -5,7 +5,7 @@
<description>Specify version to be used in tarball. Defaults to
automatically detected value formatted by versionformat parameter.</description>
</parameter>
<parameter name="version">
- <description>Specify version to be used in tarball. Defaults to
automatically detected value formatted by versionformat parameter.</description>
+ <description>Specify version to be used in tarball. Defaults to
automatically detected value formatted by versionformat parameter. Disabling
the additional version string can be done by setting it to "_none_"
string.</description>
</parameter>
<parameter name="versionprefix">
<description>Specify a base version as prefix.</description>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.8.0.1499787575.2419460/tests/gitsvntests.py
new/obs-service-tar_scm-0.8.0.1507129410.0cb2d44/tests/gitsvntests.py
--- old/obs-service-tar_scm-0.8.0.1499787575.2419460/tests/gitsvntests.py
2017-07-11 17:39:35.000000000 +0200
+++ new/obs-service-tar_scm-0.8.0.1507129410.0cb2d44/tests/gitsvntests.py
2017-10-04 17:03:30.000000000 +0200
@@ -141,9 +141,9 @@
expected_author,
textwrap.dedent("""\
- Update to version 0.6.%s:
- \* 3
- \* 4
\* 5
+ \* 4
+ \* 3
""") % rev
)
self._check_changes(orig_changes, expected_changes_regexp)
@@ -171,9 +171,9 @@
expected_author,
textwrap.dedent("""\
- Update to version %s:
- \* 3
- \* 4
\* 5
+ \* 4
+ \* 3
""") % ver_regex
)
self._check_changes(orig_changes, expected_changes_regexp)
@@ -201,9 +201,9 @@
expected_author,
textwrap.dedent("""\
- Update to version 0.6.%s:
- \* 6
- \* 7
\* 8
+ \* 7
+ \* 6
""") % self.changesrevision(rev, abbrev=True)
)
self._check_changes(orig_changes, expected_changes_regexp)
