Hello community,
here is the log from the commit of package gnome-code-assistance for
openSUSE:Factory checked in at 2016-04-01 13:03:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-code-assistance (Old)
and /work/SRC/openSUSE:Factory/.gnome-code-assistance.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-code-assistance"
Changes:
--------
---
/work/SRC/openSUSE:Factory/gnome-code-assistance/gnome-code-assistance.changes
2015-10-06 16:10:25.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.gnome-code-assistance.new/gnome-code-assistance.changes
2016-04-01 13:03:23.000000000 +0200
@@ -1,0 +2,9 @@
+Wed Mar 30 09:31:03 UTC 2016 - [email protected]
+
+- Prepare for libvala-0.32 via sed replacement.
+- Following above change, replace pkgconfig(libvala-0.30) for
+ pkgconfig(libvala-0.32) BuildRequires.
+- Add gca-python-fix-crash-when-missing-pylint.patch: Fix crash
+ when pylint is not available. Patch from upstream git.
+
+-------------------------------------------------------------------
New:
----
gca-python-fix-crash-when-missing-pylint.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-code-assistance.spec ++++++
--- /var/tmp/diff_new_pack.cXBQjv/_old 2016-04-01 13:03:24.000000000 +0200
+++ /var/tmp/diff_new_pack.cXBQjv/_new 2016-04-01 13:03:24.000000000 +0200
@@ -26,6 +26,8 @@
Group: Development/
Url: https://git.gnome.org/browse/gnome-code-assistance
Source:
http://download.gnome.org/sources/gnome-code-assistance/3.16/%{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM gca-python-fix-crash-when-missing-pylint.patch
[email protected] -- python: fix crash when pylint is not available.
+Patch0: gca-python-fix-crash-when-missing-pylint.patch
# Generic build dependencies
BuildRequires: pkgconfig(gio-2.0)
# Python backend
@@ -46,7 +48,7 @@
BuildRequires: pkgconfig(gio-2.0) >= 2.36
BuildRequires: pkgconfig(glib-2.0) >= 2.36
BuildRequires: pkgconfig(gobject-2.0) >= 2.36
-BuildRequires: pkgconfig(libvala-0.30)
+BuildRequires: pkgconfig(libvala-0.32)
BuildRequires: pkgconfig(vapigen)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%glib2_gsettings_schema_requires
@@ -59,8 +61,9 @@
%prep
%setup -q
-# Prepare for vala-0.30 - Upstream have committed the same change, use sed to
avoid need for bootstrapping.
-sed -i 's:libvala-0.28 libvala-0.26 libvala-0.24 libvala-0.22
libvala-0.20:libvala-0.30 libvala-0.28 libvala-0.26 libvala-0.24 libvala-0.22
libvala-0.20:' configure
+# Prepare for vala-0.32 - Upstream have committed the same change, use sed to
avoid need for bootstrapping.
+sed -i 's:libvala-0.28 libvala-0.26 libvala-0.24 libvala-0.22
libvala-0.20:libvala-0.32 libvala-0.30 libvala-0.28 libvala-0.26 libvala-0.24
libvala-0.22 libvala-0.20:' configure
+%patch0 -p1
%build
%configure \
++++++ gca-python-fix-crash-when-missing-pylint.patch ++++++
>From cd0f439a2cb67a1f7f0a6f468c33db5731321402 Mon Sep 17 00:00:00 2001
From: Christian Hergert <[email protected]>
Date: Sun, 21 Feb 2016 17:11:10 -0800
Subject: python: fix crash when pylint is not available
If the client suggests the use of pylint using {"pylint":True}, then make
sure that we have pylint available before calling into the linter module.
---
backends/python/__init__.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/backends/python/__init__.py b/backends/python/__init__.py
index 9476d6f..8dc2cf2 100644
--- a/backends/python/__init__.py
+++ b/backends/python/__init__.py
@@ -24,8 +24,9 @@ import re
try:
from pylint import lint
from pylint.reporters.text import TextReporter
+ HAS_PYLINT = True
except ImportError:
- pass
+ HAS_PYLINT = False
from gnome.codeassistance import transport, types
@@ -97,7 +98,7 @@ class Service(transport.Service):
# PEP8 is not installed. Do nothing.
pass
- if "pylint" in options and options["pylint"]:
+ if HAS_PYLINT and "pylint" in options and options["pylint"]:
pylint = PyLint(doc.data_path)
diagnostics = pylint.run()
--
cgit v0.12
