Hello community,
here is the log from the commit of package obs-service-set_version for
openSUSE:Factory checked in at 2016-03-09 15:17:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/obs-service-set_version (Old)
and /work/SRC/openSUSE:Factory/.obs-service-set_version.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "obs-service-set_version"
Changes:
--------
---
/work/SRC/openSUSE:Factory/obs-service-set_version/obs-service-set_version.changes
2015-09-11 09:04:36.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.obs-service-set_version.new/obs-service-set_version.changes
2016-03-09 16:48:35.000000000 +0100
@@ -1,0 +2,9 @@
+Thu Mar 03 16:42:56 UTC 2016 - [email protected]
+
+- Update to version 0.5.3:
+ + Use old version from testing data instead of hardcoding
+ + Fix replacement of empty tags
+ + Fix empty version checks for debian/changelog
+ + fix when switching from .dev to non-dev version
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-set_version.spec ++++++
--- /var/tmp/diff_new_pack.xMtKch/_old 2016-03-09 16:48:36.000000000 +0100
+++ /var/tmp/diff_new_pack.xMtKch/_new 2016-03-09 16:48:36.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package obs-service-set_version
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.xMtKch/_old 2016-03-09 16:48:36.000000000 +0100
+++ /var/tmp/diff_new_pack.xMtKch/_new 2016-03-09 16:48:36.000000000 +0100
@@ -1,5 +1,5 @@
<servicedata>
<service name="tar_scm">
<param
name="url">[email protected]:openSUSE/obs-service-set_version.git</param>
- <param
name="changesrevision">a7f421ccd5879c656bc55469727ac8954d8f535d</param></service>
+ <param
name="changesrevision">e4ef61441030a385985e8c9d952825ad550a8c21</param></service>
</servicedata>
\ No newline at end of file
++++++ obs-service-set_version-0.5.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-set_version-0.5.3/set_version
new/obs-service-set_version-0.5.3/set_version
--- old/obs-service-set_version-0.5.3/set_version 2015-09-03
09:24:48.000000000 +0200
+++ new/obs-service-set_version-0.5.3/set_version 2016-03-03
17:42:56.000000000 +0100
@@ -204,11 +204,11 @@
flags=re.MULTILINE)
else:
# keep inline macros for rpm
- contents_new, subs = re.subn(r'^{tag}:(\s*)[^%].*'.format(tag=tag),
- r'{tag}:\g<1>{string}'.format(
- tag=tag, string=string),
- contents, flags=re.MULTILINE)
-
+ contents_new, subs = re.subn(
+ r'^{tag}:([ \t\f\v]*)[^%\n\r]*'.format(tag=tag),
+ r'{tag}:\g<1>{string}'.format(
+ tag=tag, string=string),
+ contents, flags=re.MULTILINE)
if subs > 0:
f.truncate()
f.write(contents_new)
@@ -318,9 +318,9 @@
for f in filter(lambda x: x.endswith(".spec"), files):
filename = outdir + "/" + f
shutil.copyfile(f, filename)
+ _add_or_replace_define(filename, "version_unconverted", version)
if version_converted and version_converted != version:
_replace_tag(filename, 'Version', version_converted)
- _add_or_replace_define(filename, "version_unconverted", version)
_replace_spec_setup(filename, "version_unconverted")
else:
_replace_tag(filename, 'Version', version)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-set_version-0.5.3/tests/data_test_from_tarball_with_single_file.json
new/obs-service-set_version-0.5.3/tests/data_test_from_tarball_with_single_file.json
---
old/obs-service-set_version-0.5.3/tests/data_test_from_tarball_with_single_file.json
2015-09-03 09:24:48.000000000 +0200
+++
new/obs-service-set_version-0.5.3/tests/data_test_from_tarball_with_single_file.json
2016-03-03 17:42:56.000000000 +0100
@@ -1,8 +1,10 @@
[
- ["testprog-1.2.3.tar", [], "1.2.3"],
- ["tetsprog-2015.10.tar", [], "2015.10"],
- ["testprog-512.tar", [], "512"],
- ["1.2.3.tar", ["testprog-4.5.6"], "4.5.6"],
- ["testprog-1.2.3.tar", ["testprog-4.5.6"], "1.2.3"],
- ["testprog-master.tar", ["testprog-4.5.6"], "4.5.6"]
+ ["testprog-1.2.3.tar", [], "8.8.8", "1.2.3"],
+ ["tetsprog-2015.10.tar", [], "8.8.8", "2015.10"],
+ ["testprog-512.tar", [], "8.8.8", "512"],
+ ["1.2.3.tar", ["testprog-4.5.6"], "8.8.8", "4.5.6"],
+ ["testprog-1.2.3.tar", ["testprog-4.5.6"], "8.8.8", "1.2.3"],
+ ["testprog-master.tar", ["testprog-4.5.6"], "8.8.8", "4.5.6"],
+ ["testprog-master.tar", ["testprog-4.5.6"], " ", "4.5.6"],
+ ["testprog-master.tar", ["testprog-4.5.6"], "", "4.5.6"]
]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-set_version-0.5.3/tests/test_debianchangelog.py
new/obs-service-set_version-0.5.3/tests/test_debianchangelog.py
--- old/obs-service-set_version-0.5.3/tests/test_debianchangelog.py
2015-09-03 09:24:48.000000000 +0200
+++ new/obs-service-set_version-0.5.3/tests/test_debianchangelog.py
2016-03-03 17:42:56.000000000 +0100
@@ -42,6 +42,9 @@
"""Test set_version service for debian/changelog files"""
def _write_debian_changelog(self, filename, version):
+ # debian changelogs can't be created with empty versions
+ if not version.strip():
+ version = "0~0"
subprocess.check_call("dch --create --empty -v "
"%s --package foobar -c %s" %
(version, filename), shell=True)
@@ -58,14 +61,14 @@
@file_data("data_test_from_tarball_with_single_file.json")
def test_from_tarball_with_single_file(self, data):
- tarball_name, tarball_dirs, expected_version = data
- old_version = "8.8.8"
+ tarball_name, tarball_dirs, old_version, expected_version = data
changelog_path = self._write_debian_changelog(
"debian.changelog", old_version)
self._write_tarfile(tarball_name, tarball_dirs, [])
self._run_set_version()
self._check_file_assert_contains(changelog_path, expected_version)
- self._check_file_assert_not_contains(changelog_path, old_version)
+ if old_version.strip():
+ self._check_file_assert_not_contains(changelog_path, old_version)
@file_data("data_test_from_tarball_with_basename_with_multiple_files.json")
def test_from_tarball_with_basename_with_multiple_files(self, data):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-set_version-0.5.3/tests/test_rpmspec.py
new/obs-service-set_version-0.5.3/tests/test_rpmspec.py
--- old/obs-service-set_version-0.5.3/tests/test_rpmspec.py 2015-09-03
09:24:48.000000000 +0200
+++ new/obs-service-set_version-0.5.3/tests/test_rpmspec.py 2016-03-03
17:42:56.000000000 +0100
@@ -75,10 +75,10 @@
@file_data("data_test_from_tarball_with_single_file.json")
def test_from_tarball_with_single_file(self, data):
- tarball_name, tarball_dirs, expected_version = data
+ tarball_name, tarball_dirs, old_version, expected_version = data
spec_path = self._write_specfile("test.spec",
{"Name": "foo",
- "Version": "UNKNOWN",
+ "Version": old_version,
"Group": "AnyGroup"})
self._write_tarfile(tarball_name, tarball_dirs, [])
self._run_set_version()
@@ -177,6 +177,20 @@
"test-master.tar",
[],
["test-5.0.0.0b2dev188/test.egg-info/PKG-INFO"]
+ ),
+ (
+ "test.spec",
+ [
+ "Version: 5.0.0.0~b2~dev188",
+ "%define version_unconverted 5.0.0.0b2dev188",
+ ],
+ [
+ "Version: 5.1.0",
+ "%define version_unconverted 5.1.0",
+ ],
+ "test-master.tar",
+ [],
+ ["test-5.1.0/test.egg-info/PKG-INFO"]
)
)
@unpack
