Hello community,
here is the log from the commit of package obs-service-set_version for
openSUSE:Factory checked in at 2018-09-18 11:44:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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"
Tue Sep 18 11:44:59 2018 rev:33 rq:636140 version:0.5.9
Changes:
--------
---
/work/SRC/openSUSE:Factory/obs-service-set_version/obs-service-set_version.changes
2017-12-21 11:29:37.806711100 +0100
+++
/work/SRC/openSUSE:Factory/.obs-service-set_version.new/obs-service-set_version.changes
2018-09-18 11:45:47.339763594 +0200
@@ -1,0 +2,7 @@
+Mon Sep 17 09:28:09 UTC 2018 - [email protected]
+
+- Update to version 0.5.9:
+ * avoid crashes due to false is_zipfile() response
+- enable test suite
+
+-------------------------------------------------------------------
Old:
----
obs-service-set_version-0.5.8.tar.gz
New:
----
obs-service-set_version-0.5.9.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-set_version.spec ++++++
--- /var/tmp/diff_new_pack.5AzBkJ/_old 2018-09-18 11:45:49.155761709 +0200
+++ /var/tmp/diff_new_pack.5AzBkJ/_new 2018-09-18 11:45:49.159761706 +0200
@@ -1,7 +1,7 @@
#
# spec file for package obs-service-set_version
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -12,20 +12,23 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define service set_version
Name: obs-service-%{service}
-Version: 0.5.8
+Version: 0.5.9
Release: 0
Summary: An OBS source service: Update spec file version
-License: GPL-2.0+
+License: GPL-2.0-or-later
Group: Development/Tools/Building
Url: https://github.com/openSUSE/obs-service-%{service}
Source: %{name}-%{version}.tar.gz
+BuildRequires: python3-ddt
+BuildRequires: python3-flake8
+BuildRequires: python3-packaging
%if 0%{?suse_version}
%if 0%{?suse_version} > 1315
Recommends: python3-packaging
@@ -52,6 +55,9 @@
sed -i -e "1 s,#!/usr/bin/python$,#!/usr/bin/python3," set_version
%endif
+%check
+make test PYTHON=python3
+
%install
mkdir -p %{buildroot}%{_prefix}/lib/obs/service
install -m 0755 set_version %{buildroot}%{_prefix}/lib/obs/service
++++++ PKGBUILD ++++++
--- /var/tmp/diff_new_pack.5AzBkJ/_old 2018-09-18 11:45:49.183761680 +0200
+++ /var/tmp/diff_new_pack.5AzBkJ/_new 2018-09-18 11:45:49.183761680 +0200
@@ -1,5 +1,5 @@
pkgname=obs-service-set_version
-pkgver=0.5.8
+pkgver=0.5.9
pkgrel=0
pkgdesc="An OBS source service: Update spec file version"
arch=('i686' 'x86_64')
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.5AzBkJ/_old 2018-09-18 11:45:49.211761651 +0200
+++ /var/tmp/diff_new_pack.5AzBkJ/_new 2018-09-18 11:45:49.215761648 +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">5fabceedf07f6a8597b510e16993b613eded4655</param></service>
+ <param
name="changesrevision">4247c6fdf18d9de6d289b0086528079a6b037080</param></service>
</servicedata>
\ No newline at end of file
++++++ debian.dsc ++++++
--- /var/tmp/diff_new_pack.5AzBkJ/_old 2018-09-18 11:45:49.231761631 +0200
+++ /var/tmp/diff_new_pack.5AzBkJ/_new 2018-09-18 11:45:49.231761631 +0200
@@ -1,9 +1,9 @@
Format: 1.0
Source: obs-service-set_version
-Version: 0.5.8-0
+Version: 0.5.9-0
Binary: obs-service-set_version
Provides: obs-service-set_version
Maintainer: Adrian Schroeter <[email protected]>
Architecture: all
Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 7), python, flake8 | python-flake8, python-ddt,
python-packaging
++++++ obs-service-set_version-0.5.8.tar.gz ->
obs-service-set_version-0.5.9.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-set_version-0.5.8/Makefile
new/obs-service-set_version-0.5.9/Makefile
--- old/obs-service-set_version-0.5.8/Makefile 2017-12-11 13:06:13.000000000
+0100
+++ new/obs-service-set_version-0.5.9/Makefile 2018-09-17 11:27:24.000000000
+0200
@@ -1,4 +1,5 @@
prefix = /usr
+PYTHON := python
servicedir = ${prefix}/lib/obs/service
@@ -11,7 +12,7 @@
test:
flake8 set_version tests/
- python -m unittest discover tests/
+ ${PYTHON} -m unittest discover tests/
clean:
find -name "*.pyc" -exec rm {} \;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-set_version-0.5.8/README.md
new/obs-service-set_version-0.5.9/README.md
--- old/obs-service-set_version-0.5.8/README.md 2017-12-11 13:06:13.000000000
+0100
+++ new/obs-service-set_version-0.5.9/README.md 2018-09-17 11:27:24.000000000
+0200
@@ -15,7 +15,7 @@
## Test suite
To run the full testsuite, some dependencies are needed:
- zypper in devscripts dpkg
+ zypper in devscripts dpkg python-flake8
If the dependencies are not installed, some tests are skipped. `zypper` itself
is also needed for the tests with python packages and PEP440 compatible
versions.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-set_version-0.5.8/debian/control
new/obs-service-set_version-0.5.9/debian/control
--- old/obs-service-set_version-0.5.8/debian/control 2017-12-11
13:06:13.000000000 +0100
+++ new/obs-service-set_version-0.5.9/debian/control 2018-09-17
11:27:24.000000000 +0200
@@ -2,7 +2,7 @@
Section: devel
Priority: extra
Maintainer: Daniel Gollub <[email protected]>
-Build-Depends: debhelper (>= 8.0.0)
+Build-Depends: debhelper (>= 8.0.0), python, flake8 | python-flake8,
python-ddt, python-packaging
Standards-Version: 3.9.3
Homepage: https://github.com/openSUSE/obs-service-set_version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-set_version-0.5.8/set_version
new/obs-service-set_version-0.5.9/set_version
--- old/obs-service-set_version-0.5.8/set_version 2017-12-11
13:06:13.000000000 +0100
+++ new/obs-service-set_version-0.5.9/set_version 2018-09-17
11:27:24.000000000 +0200
@@ -26,7 +26,7 @@
try:
from packaging.version import LegacyVersion, Version, parse
-except ImportError as exc:
+except ImportError:
HAS_PACKAGING = False
import warnings
warnings.warn("install 'packaging' to improve python package versions",
@@ -124,16 +124,21 @@
return v
# handle zipfiles
if zipfile.is_zipfile(f):
- with zipfile.ZipFile(f, 'r') as zf:
- v = self.__get_version(zf.namelist())
- if v:
- return v
+ try:
+ with zipfile.ZipFile(f, 'r') as zf:
+ v = self.__get_version(zf.namelist())
+ if v:
+ return v
+ except OSError:
+ # is_zipfile has often false positives and module is
+ # crashing on processing
+ pass
# Nothing found
return None
def _get_version_via_obsinfo(self):
- join_suffix = self.basename + ".obsinfo"
- for fname in filter(lambda x: x.endswith(join_suffix), self.file_list):
+ for fname in filter(lambda x: x.startswith(self.basename) and
+ x.endswith(".obsinfo"), self.file_list):
if os.path.exists(fname):
with codecs.open(fname, 'r', 'utf8') as fp:
for line in fp:
@@ -193,8 +198,13 @@
with tarfile.open(f) as tf:
names = tf.getnames()
if zipfile.is_zipfile(f):
- with zipfile.ZipFile(f, 'r') as zf:
- names = zf.namelist()
+ try:
+ with zipfile.ZipFile(f, 'r') as zf:
+ names = zf.namelist()
+ except OSError:
+ # is_zipfile has often false positives and module is
+ # crashing on processing
+ pass
for n in map(lambda x: os.path.normpath(x), names):
if n.endswith("egg-info/PKG-INFO"):
return True
