Hello community,
here is the log from the commit of package obs-service-set_version for
openSUSE:Factory checked in at 2017-05-06 18:30:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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"
Sat May 6 18:30:33 2017 rev:26 rq:492873 version:0.5.6
Changes:
--------
---
/work/SRC/openSUSE:Factory/obs-service-set_version/obs-service-set_version.changes
2017-03-12 20:04:35.292762983 +0100
+++
/work/SRC/openSUSE:Factory/.obs-service-set_version.new/obs-service-set_version.changes
2017-05-06 18:30:39.766665155 +0200
@@ -1,0 +2,6 @@
+Thu Apr 27 12:48:11 UTC 2017 - [email protected]
+
+- Update to version 0.5.6:
+ * strip \n from version in obsinfo
+
+-------------------------------------------------------------------
Old:
----
obs-service-set_version-0.5.5.tar.gz
New:
----
obs-service-set_version-0.5.6.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-set_version.spec ++++++
--- /var/tmp/diff_new_pack.ObWumr/_old 2017-05-06 18:30:40.546555108 +0200
+++ /var/tmp/diff_new_pack.ObWumr/_new 2017-05-06 18:30:40.550554544 +0200
@@ -19,7 +19,7 @@
%define service set_version
Name: obs-service-%{service}
-Version: 0.5.5
+Version: 0.5.6
Release: 0
Summary: An OBS source service: Update spec file version
License: GPL-2.0+
++++++ PKGBUILD ++++++
--- /var/tmp/diff_new_pack.ObWumr/_old 2017-05-06 18:30:40.594548337 +0200
+++ /var/tmp/diff_new_pack.ObWumr/_new 2017-05-06 18:30:40.594548337 +0200
@@ -1,5 +1,5 @@
pkgname=obs-service-set_version
-pkgver=0.5.5
+pkgver=0.5.6
pkgrel=0
pkgdesc="An OBS source service: Update spec file version"
arch=('i686' 'x86_64')
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.ObWumr/_old 2017-05-06 18:30:40.638542128 +0200
+++ /var/tmp/diff_new_pack.ObWumr/_new 2017-05-06 18:30:40.638542128 +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">d2e983f302f6c5396cc84a53413d648305cba35d</param></service>
+ <param
name="changesrevision">3400eb450b66a33c49d240b4405e6d9e51e2c281</param></service>
</servicedata>
\ No newline at end of file
++++++ debian.dsc ++++++
--- /var/tmp/diff_new_pack.ObWumr/_old 2017-05-06 18:30:40.666538178 +0200
+++ /var/tmp/diff_new_pack.ObWumr/_new 2017-05-06 18:30:40.666538178 +0200
@@ -1,6 +1,6 @@
Format: 1.0
Source: obs-service-set_version
-Version: 0.5.5
+Version: 0.5.6-0
Binary: obs-service-set_version
Provides: obs-service-set_version
Maintainer: Adrian Schroeter <[email protected]>
++++++ obs-service-set_version-0.5.5.tar.gz ->
obs-service-set_version-0.5.6.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-set_version-0.5.5/set_version
new/obs-service-set_version-0.5.6/set_version
--- old/obs-service-set_version-0.5.5/set_version 2017-03-02
09:46:00.000000000 +0100
+++ new/obs-service-set_version-0.5.6/set_version 2017-04-04
22:09:32.000000000 +0200
@@ -113,7 +113,9 @@
with open(filename, "r") as fp:
for line in fp:
if line.startswith("version: "):
- return line[9:]
+ string = line[9:]
+ string = string.rstrip()
+ return string
# Nothing found
return None
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-set_version-0.5.5/tests/test_rpmspec.py
new/obs-service-set_version-0.5.6/tests/test_rpmspec.py
--- old/obs-service-set_version-0.5.5/tests/test_rpmspec.py 2017-03-02
09:46:00.000000000 +0100
+++ new/obs-service-set_version-0.5.6/tests/test_rpmspec.py 2017-04-04
22:09:32.000000000 +0200
@@ -16,11 +16,13 @@
import os
-
+import imp
from ddt import data, ddt, file_data, unpack
from test_base import SetVersionBaseTest
+sv = imp.load_source("set_version", "set_version")
+
@ddt
class SetVersionSpecfile(SetVersionBaseTest):
@@ -51,6 +53,12 @@
f.write("\n")
return spec_path
+ def test_version_from_obsinfo(self):
+ obsinfo = self._write_obsinfo("test.obsinfo", "0.0.1")
+ files = [obsinfo]
+ ver = sv.VersionDetector._get_version_via_obsinfo(files, '')
+ self.assertEqual(ver, "0.0.1")
+
@file_data("data_test_from_commandline.json")
def test_from_commandline(self, data):
old_version, new_version = data
