Skip to content

Commit

Permalink
merge dnfdaemon-0.3.15 release
Browse files Browse the repository at this point in the history
  • Loading branch information
Tim Lauridsen committed May 10, 2016
2 parents 593601d + ab8eb32 commit ad3e736
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 6 deletions.
24 changes: 24 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,27 @@
2016-05-10 Tim Lauridsen <[email protected]>

* dnfdaemon.spec: bumped version to 0.3.15

2016-05-10 Tim Lauridsen <[email protected]>

* python/dnfdaemon/server/backend.py: Show all kernel packages as
updates

2016-05-10 Tim Lauridsen <[email protected]>

* 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 <[email protected]>

Merge branch 'release-0.3.14' into develop

2016-04-29 Tim Lauridsen <[email protected]>

* ChangeLog: updated ChangeLog

2016-04-29 Tim Lauridsen <[email protected]>

* dnfdaemon.spec: bumped version to 0.3.14
Expand Down
5 changes: 4 additions & 1 deletion dnfdaemon.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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+
Expand Down Expand Up @@ -99,6 +99,9 @@ fi
%{python3_sitelib}/%{name}/client

%changelog
* Tue May 10 2016 Tim Lauridsen <[email protected]> 0.3.15-1
- bumped release

* Fri Apr 29 2016 Tim Lauridsen <[email protected]> 0.3.14-1
- bumped release

Expand Down
7 changes: 5 additions & 2 deletions python/dnfdaemon/server/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -227,10 +227,13 @@ def search_with_attr(self, fields, keys, attrs, match_all, newest_only,

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:
Expand Down
6 changes: 3 additions & 3 deletions python/dnfdaemon/server/backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ def setup_base(self):
"""Setup dnf Sack and init packages helper"""
logger.debug('setup DnfBase sack')
self.fill_sack()
logger.debug('setup packages')
self._packages = Packages(self)

@property
Expand Down Expand Up @@ -150,7 +151,7 @@ def updates(self):
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:
Expand All @@ -160,8 +161,7 @@ def updates(self):
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
Expand Down

0 comments on commit ad3e736

Please sign in to comment.