diff --git a/ChangeLog b/ChangeLog index 3b80bb193116a0cfebbf9a2e321945e58a41e0f6..8e5def740fbf1384d305991ecdce1078d7786030 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,27 @@ +2016-05-10 Tim Lauridsen <timlau@fedoraproject.org> + + * dnfdaemon.spec: bumped version to 0.3.15 + +2016-05-10 Tim Lauridsen <timlau@fedoraproject.org> + + * python/dnfdaemon/server/backend.py: Show all kernel packages as + updates + +2016-05-10 Tim Lauridsen <timlau@fedoraproject.org> + + * python/dnfdaemon/server/__init__.py, + python/dnfdaemon/server/backend.py: workaround for + dnf.Base.reset(sack=True) in hawkey 6.0.3 + https://bugzilla.redhat.com/show_bug.cgi?id=1332067 + +2016-04-29 Tim Lauridsen <timlau@fedoraproject.org> + + Merge branch 'release-0.3.14' into develop + +2016-04-29 Tim Lauridsen <timlau@fedoraproject.org> + + * ChangeLog: updated ChangeLog + 2016-04-29 Tim Lauridsen <timlau@fedoraproject.org> * dnfdaemon.spec: bumped version to 0.3.14 diff --git a/dnfdaemon.spec b/dnfdaemon.spec index 1fb086e7832abf5d66373018bd207834c3b91950..8b7807703212ab581a9f3009216d80ad9ab61843 100644 --- a/dnfdaemon.spec +++ b/dnfdaemon.spec @@ -2,7 +2,7 @@ %global dnf_version 1.1.0 Name: dnfdaemon -Version: 0.3.14 +Version: 0.3.15 Release: 1%{?dist} Summary: DBus daemon for dnf package actions License: GPLv2+ @@ -99,6 +99,9 @@ fi %{python3_sitelib}/%{name}/client %changelog +* Tue May 10 2016 Tim Lauridsen <timlau@fedoraproject.org> 0.3.15-1 +- bumped release + * Fri Apr 29 2016 Tim Lauridsen <timlau@fedoraproject.org> 0.3.14-1 - bumped release diff --git a/python/dnfdaemon/server/__init__.py b/python/dnfdaemon/server/__init__.py index c2203721a32963877e245a232af8f1eec1dd0e6e..4a6078d9f7103a4502e40e1367a76b638489f838 100644 --- a/python/dnfdaemon/server/__init__.py +++ b/python/dnfdaemon/server/__init__.py @@ -227,10 +227,13 @@ class DnfDaemonBase(dbus.service.Object, DownloadCallback): def expire_cache(self): """Expire the dnf cache.""" - try: self.base.expire_cache() - self.base.reset(sack=True) + self.base.reset(sack=True, repos=True) + #FIXME: Workaround for dnf.Base.reset in hawkey 6.0.3 + # https://bugzilla.redhat.com/show_bug.cgi?id=1332067 + self.base.read_all_repos() + self.base.repos.all().set_progress_bar(self.base.md_progress) self.base.setup_base() return True except dnf.exceptions.RepoError as e: diff --git a/python/dnfdaemon/server/backend.py b/python/dnfdaemon/server/backend.py index dc224b34511aa11bd23668efe3d2a0582b488185..ffc55fd87a66f889211a6ff401862935c07798f7 100644 --- a/python/dnfdaemon/server/backend.py +++ b/python/dnfdaemon/server/backend.py @@ -64,6 +64,7 @@ class DnfBase(dnf.Base): """Setup dnf Sack and init packages helper""" logger.debug('setup DnfBase sack') self.fill_sack() + logger.debug('setup packages') self._packages = Packages(self) @property @@ -150,7 +151,7 @@ class Packages: self._base.upgrade_all() self._base.resolve(allow_erasing=True) except dnf.exceptions.DepsolveError as e: - self.logger.debug(str(e)) + logger.debug(str(e)) return pkgs # return install/upgrade type pkgs from transaction for tsi in self._base.transaction: @@ -160,8 +161,7 @@ class Packages: elif tsi.op_type == dnf.transaction.INSTALL: po = tsi.installed # action is INSTALL, then it should be a installonlypkg - if po.name in self._base.conf.installonlypkgs: - pkgs.append(po) + pkgs.append(po) return pkgs @property