45 lines
2.0 KiB
Diff
45 lines
2.0 KiB
Diff
|
diff -ru dnf-4.0.4.orig/dnf/base.py dnf-4.0.4/dnf/base.py
|
||
|
|
--- dnf-4.0.4.orig/dnf/base.py 2019-06-02 15:26:56.912792437 +0200
|
||
|
|
+++ dnf-4.0.4/dnf/base.py 2019-06-02 15:27:29.783939255 +0200
|
||
|
|
@@ -1676,7 +1676,7 @@
|
||
|
|
myts = dnf.rpm.transaction.initReadOnlyTransaction(root=installroot)
|
||
|
|
myts.pushVSFlags(~(rpm.RPMVSF_NODSAHEADER))
|
||
|
|
idx = myts.dbMatch('name', 'gpg-pubkey')
|
||
|
|
- keys = len(idx)
|
||
|
|
+ keys = idx.count()
|
||
|
|
del idx
|
||
|
|
del myts
|
||
|
|
|
||
|
|
Only in dnf-4.0.4/dnf: base.py.orig
|
||
|
|
diff -ru dnf-4.0.4.orig/dnf/const.py.in dnf-4.0.4/dnf/const.py.in
|
||
|
|
--- dnf-4.0.4.orig/dnf/const.py.in 2019-06-02 15:21:54.000000000 +0200
|
||
|
|
+++ dnf-4.0.4/dnf/const.py.in 2019-06-02 15:27:59.991074300 +0200
|
||
|
|
@@ -25,7 +25,7 @@
|
||
|
|
CONF_AUTOMATIC_FILENAME='/etc/dnf/automatic.conf'
|
||
|
|
DISTROVERPKG=('system-release(releasever)', 'system-release',
|
||
|
|
'distribution-release(releasever)', 'distribution-release',
|
||
|
|
- 'redhat-release', 'suse-release')
|
||
|
|
+ 'openmamba-release', 'redhat-release', 'suse-release')
|
||
|
|
GROUP_PACKAGE_TYPES = ('mandatory', 'default', 'conditional') # :api
|
||
|
|
INSTALLONLYPKGS=['kernel', 'kernel-PAE',
|
||
|
|
'installonlypkg(kernel)',
|
||
|
|
Only in dnf-4.0.4/dnf: const.py.in.orig
|
||
|
|
Only in dnf-4.0.4/dnf: const.py.in.rej
|
||
|
|
diff -ru dnf-4.0.4.orig/dnf/rpm/__init__.py dnf-4.0.4/dnf/rpm/__init__.py
|
||
|
|
--- dnf-4.0.4.orig/dnf/rpm/__init__.py 2019-06-02 15:26:56.912792437 +0200
|
||
|
|
+++ dnf-4.0.4/dnf/rpm/__init__.py 2019-06-02 15:27:29.783939255 +0200
|
||
|
|
@@ -39,10 +39,10 @@
|
||
|
|
idx = ts.dbMatch('provides', distroverpkg)
|
||
|
|
except (TypeError, rpm.error) as e:
|
||
|
|
raise dnf.exceptions.Error('Error: %s' % str(e))
|
||
|
|
- if not len(idx):
|
||
|
|
+ if idx.count() == 0:
|
||
|
|
continue
|
||
|
|
try:
|
||
|
|
- hdr = next(idx)
|
||
|
|
+ hdr = idx.next()
|
||
|
|
except StopIteration:
|
||
|
|
msg = 'Error: rpmdb failed to list provides. Try: rpm --rebuilddb'
|
||
|
|
raise dnf.exceptions.Error(msg)
|
||
|
|
Only in dnf-4.0.4/dnf/rpm: __init__.py.orig
|