From c29b54c6d9f8258861865f005dd7387b094789b2 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Mar 10 2016 08:19:03 +0000 Subject: Update to latest upstream --- diff --git a/.gitignore b/.gitignore index 4e94aaa..2f36cb8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /pdc-client-0.2.0.2.tar.gz +/pdc-client-0.9.0.tar.gz diff --git a/0001-Fix-release-component-update-logging-type.patch b/0001-Fix-release-component-update-logging-type.patch deleted file mode 100644 index be09990..0000000 --- a/0001-Fix-release-component-update-logging-type.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 63c4af4d2e984b7235b80de89ec2aa3236f9871f Mon Sep 17 00:00:00 2001 -From: Stanislav Ochotnicky -Date: Fri, 8 Jan 2016 17:27:49 +0100 -Subject: [PATCH] Fix release component update logging type - -release_component_id is sting at this time and logging complains when running -testsuite on F22. Partial traceback: - - File "/home/w0rm/rpmbuild/BUILD/pdc-client-0.1.9/pdc_client/plugins/component.py", line 291, in release_component_update - release_component_id, data) - File "/usr/lib64/python2.7/logging/__init__.py", line 1153, in debug - self._log(DEBUG, msg, args, **kwargs) - File "/usr/lib64/python2.7/logging/__init__.py", line 1284, in _log - self.handle(record) - File "/usr/lib64/python2.7/logging/__init__.py", line 1294, in handle - self.callHandlers(record) - File "/usr/lib64/python2.7/logging/__init__.py", line 1334, in callHandlers - hdlr.handle(record) - File "/usr/lib64/python2.7/logging/__init__.py", line 757, in handle - self.emit(record) - File "/usr/lib/python2.7/site-packages/nose/plugins/logcapture.py", line 82, in emit - self.buffer.append(self.format(record)) - File "/usr/lib64/python2.7/logging/__init__.py", line 732, in format - return fmt.format(record) - File "/usr/lib64/python2.7/logging/__init__.py", line 471, in format - record.message = record.getMessage() - File "/usr/lib64/python2.7/logging/__init__.py", line 335, in getMessage - msg = msg % self.args -TypeError: %d format: a number is required, not str ---- - pdc_client/plugins/component.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pdc_client/plugins/component.py b/pdc_client/plugins/component.py -index a71b07b..c362613 100644 ---- a/pdc_client/plugins/component.py -+++ b/pdc_client/plugins/component.py -@@ -288,7 +288,7 @@ class ReleaseComponentPlugin(PDCClientPlugin): - data['active'] = args.active - if data: - self.logger.debug('Updating release component %d with data %r', -- release_component_id, data) -+ int(release_component_id), data) - self.client['release-components'][release_component_id]._ += data - else: - self.logger.debug('Empty data, skipping request') --- -2.4.10 - diff --git a/pdc-client.spec b/pdc-client.spec index 4c3a2d5..bd774c4 100644 --- a/pdc-client.spec +++ b/pdc-client.spec @@ -9,8 +9,8 @@ %global with_python3 0 Name: pdc-client -Version: 0.2.0.2 -Release: 4%{?dist} +Version: 0.9.0 +Release: 1%{?dist} Summary: Client library and console client for Product Definition Center License: MIT URL: https://github.com/product-definition-center/pdc-client @@ -18,9 +18,6 @@ BuildArch: noarch Source0: https://pypi.python.org/packages/source/p/pdc-client/pdc-client-%{version}.tar.gz -# https://github.com/product-definition-center/pdc-client/pull/32 -Patch0: 0001-Fix-release-component-update-logging-type.patch - BuildRequires: python2-devel BuildRequires: python-setuptools BuildRequires: python-nose @@ -100,8 +97,6 @@ server connections %prep %setup -q -n pdc-client-%{version} -%patch0 -p1 - %if 0%{?with_python3} rm -rf %{py3dir} cp -a . %{py3dir} @@ -173,6 +168,9 @@ EOF %changelog +* Thu Mar 10 2016 Stanislav Ochotnicky - 0.9.0-1 +- Update to latest upstream + * Thu Feb 11 2016 Stanislav Ochotnicky - 0.2.0.2-4 - Reenable check section diff --git a/sources b/sources index 37647fa..9753c74 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ c7dc288dab145a3e96cd54a37deb4665 pdc-client-0.2.0.2.tar.gz +dd3e2bcc46a54ef4350c1aa2cef22da2 pdc-client-0.9.0.tar.gz