From 8aae2ae49f6a24701453695ba0fdbb69e0778601 Mon Sep 17 00:00:00 2001 From: Tim Lauridsen Date: Fri, 29 Apr 2016 14:17:37 +0200 Subject: [PATCH 1/3] fallback to use GObject.G_MAXINT --- python/dnfdaemon/client/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/dnfdaemon/client/__init__.py b/python/dnfdaemon/client/__init__.py index efc7902..7157d7c 100644 --- a/python/dnfdaemon/client/__init__.py +++ b/python/dnfdaemon/client/__init__.py @@ -108,7 +108,7 @@ def on_RepoMetaDataProgress(self, name, frac): logger = logging.getLogger("dnfdaemon.client") -from gi.repository import Gio, GLib +from gi.repository import Gio, GLib, GObject ORG = 'org.baseurl.DnfSystem' INTERFACE = ORG @@ -288,7 +288,7 @@ def _run_dbus_async(self, cmd, *args): func = getattr(self.daemon, cmd) # timeout = infinite func(*args, result_handler=self._return_handler, - user_data=data, timeout=GLib.G_MAXINT) + user_data=data, timeout=GObject.G_MAXINT) data['main_loop'].run() result = self._get_result(data) return result From c9df111a317f7c72269b4a3cc1da3207ae54c3e6 Mon Sep 17 00:00:00 2001 From: Tim Lauridsen Date: Fri, 29 Apr 2016 14:20:01 +0200 Subject: [PATCH 2/3] bumped version to 0.3.14 --- dnfdaemon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dnfdaemon.spec b/dnfdaemon.spec index 66e8ade..1fb086e 100644 --- a/dnfdaemon.spec +++ b/dnfdaemon.spec @@ -2,7 +2,7 @@ %global dnf_version 1.1.0 Name: dnfdaemon -Version: 0.3.13 +Version: 0.3.14 Release: 1%{?dist} Summary: DBus daemon for dnf package actions License: GPLv2+ @@ -99,6 +99,9 @@ fi %{python3_sitelib}/%{name}/client %changelog +* Fri Apr 29 2016 Tim Lauridsen 0.3.14-1 +- bumped release + * Fri Apr 29 2016 Tim Lauridsen 0.3.13-1 - bumped release From c4cdcf54aa7d41d3dfad62e976f3f18fc98da3f2 Mon Sep 17 00:00:00 2001 From: Tim Lauridsen Date: Fri, 29 Apr 2016 14:20:01 +0200 Subject: [PATCH 3/3] updated ChangeLog --- ChangeLog | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/ChangeLog b/ChangeLog index dc8fdc0..3b80bb1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2016-04-29 Tim Lauridsen + + * dnfdaemon.spec: bumped version to 0.3.14 + +2016-04-29 Tim Lauridsen + + * python/dnfdaemon/client/__init__.py: fallback to use + GObject.G_MAXINT + +2016-04-29 Tim Lauridsen + + Merge branch 'release-0.3.13' into develop + +2016-04-29 Tim Lauridsen + + * ChangeLog: updated ChangeLog + 2016-04-29 Tim Lauridsen * dnfdaemon.spec: bumped version to 0.3.13