dnf/dnf-2.7.5-python-2.7.15.patch

34 lines
1.2 KiB
Diff
Raw Normal View History

--- dnf-2.7.5/dnf/cli/output.py.orig 2019-06-02 13:54:58.348422061 +0200
+++ dnf-2.7.5/dnf/cli/output.py 2019-06-02 13:55:32.693582235 +0200
@@ -1032,14 +1032,14 @@
easy-to-read format.
"""
- forward_actions = {
- hawkey.UPGRADE,
- hawkey.UPGRADE_ALL,
- hawkey.DISTUPGRADE,
- hawkey.DISTUPGRADE_ALL,
- hawkey.DOWNGRADE,
+ forward_actions = \
+ hawkey.UPGRADE|\
+ hawkey.UPGRADE_ALL|\
+ hawkey.DISTUPGRADE|\
+ hawkey.DISTUPGRADE_ALL|\
+ hawkey.DOWNGRADE|\
hawkey.INSTALL
- }
+
skipped_conflicts = set()
skipped_broken = set()
@@ -1096,7 +1096,7 @@
# show skipped conflicting packages
if not self.conf.best and forward_actions & self.base._goal.actions:
lines = []
- upgrade_type = True if {hawkey.UPGRADE, hawkey.UPGRADE_ALL} & self.base._goal.actions \
+ upgrade_type = True if (hawkey.UPGRADE|hawkey.UPGRADE_ALL) & self.base._goal.actions \
else False
skipped_conflicts, skipped_broken = self._skipped_packages(upgrade_type=upgrade_type)
for pkg in sorted(skipped_conflicts):