Hello community,
here is the log from the commit of package obs-service-set_version for
openSUSE:Factory checked in at 2016-04-12 19:37:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2016-03-09 16:48:35.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.obs-service-set_version.new/obs-service-set_version.changes
2016-04-12 19:37:26.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Apr 08 13:28:43 UTC 2016 - [email protected]
+
+- Update to version 0.5.3:
+ * Don't add unconverted_version unconditionally
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.hlKl57/_old 2016-04-12 19:37:27.000000000 +0200
+++ /var/tmp/diff_new_pack.hlKl57/_new 2016-04-12 19:37:27.000000000 +0200
@@ -1,5 +1,5 @@
<servicedata>
<service name="tar_scm">
<param
name="url">[email protected]:openSUSE/obs-service-set_version.git</param>
- <param
name="changesrevision">e4ef61441030a385985e8c9d952825ad550a8c21</param></service>
+ <param
name="changesrevision">5dd3f3872b32332e4985845f0694a82132fe2df3</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 2016-03-03
17:42:56.000000000 +0100
+++ new/obs-service-set_version-0.5.3/set_version 2016-04-08
15:28:43.000000000 +0200
@@ -146,7 +146,7 @@
return False
-def _add_or_replace_define(filename, def_name, def_value):
+def _replace_define(filename, def_name, def_value, add_if_missing=True):
# first, modify a copy of filename and then move it
with open(filename, 'r+') as f:
contents = f.read()
@@ -157,7 +157,7 @@
r'%define {def_name}\g<1>{def_value}'.format(
def_name=def_name, def_value=def_value),
contents, flags=re.MULTILINE)
- if subs == 0:
+ if subs == 0 and add_if_missing:
# seems there was no define. add new one before 'Name:'
contents_new, subs = re.subn(
r'^(Name:.*)$',
@@ -318,8 +318,10 @@
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)
+ _replace_define(filename, "version_unconverted", version,
+ add_if_missing=False)
if version_converted and version_converted != version:
+ _replace_define(filename, "version_unconverted", version)
_replace_tag(filename, 'Version', version_converted)
_replace_spec_setup(filename, "version_unconverted")
else:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-set_version-0.5.3/tests/test_base.py
new/obs-service-set_version-0.5.3/tests/test_base.py
--- old/obs-service-set_version-0.5.3/tests/test_base.py 2016-03-03
17:42:56.000000000 +0100
+++ new/obs-service-set_version-0.5.3/tests/test_base.py 2016-04-08
15:28:43.000000000 +0200
@@ -138,14 +138,14 @@
)
)
@unpack
- def test_add_or_replace_define_replace(self, lines, expected_lines,
- define_name, define_value):
+ def test_replace_define_replace(self, lines, expected_lines,
+ define_name, define_value):
fn = os.path.join(self._tmpdir, "test-file")
with open(fn, "w") as f:
f.write("\n".join(lines))
# do the replacement
- sv._add_or_replace_define(os.path.basename(fn),
- define_name, define_value)
+ sv._replace_define(os.path.basename(fn),
+ define_name, define_value)
# check
with open(fn, "r") as f:
current_lines = f.read().split("\n")
@@ -186,14 +186,14 @@
)
)
@unpack
- def test_add_or_replace_define_add(self, lines, expected_lines,
- define_name, define_value):
+ def test_replace_define_add(self, lines, expected_lines,
+ define_name, define_value):
fn = os.path.join(self._tmpdir, "test-file")
with open(fn, "w") as f:
f.write("\n".join(lines))
# do the addition
- sv._add_or_replace_define(os.path.basename(fn),
- define_name, define_value)
+ sv._replace_define(os.path.basename(fn),
+ define_name, define_value)
# check
with open(fn, "r") as f:
current_lines = f.read().split("\n")
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 2016-03-03
17:42:56.000000000 +0100
+++ new/obs-service-set_version-0.5.3/tests/test_rpmspec.py 2016-04-08
15:28:43.000000000 +0200
@@ -191,7 +191,25 @@
"test-master.tar",
[],
["test-5.1.0/test.egg-info/PKG-INFO"]
- )
+ ),
+ (
+ "test.spec",
+ [
+ "Version: 1.2.3",
+ "Name: test",
+ "%define component test",
+ "%setup -p -n %{component}-%{version}"
+ ],
+ [
+ "Version: 5.0.0",
+ "Name: test",
+ "%define component test",
+ "%setup -p -n %{component}-%{version}"
+ ],
+ "test-master.tar",
+ [],
+ ["test-5.0.0/test.egg-info/PKG-INFO"]
+ ),
)
@unpack
def test_python_package(
