56 lines
2.5 KiB
Diff
56 lines
2.5 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:21:54.000000000 +0200
|
|
+++ dnf-4.0.4/dnf/base.py 2019-06-02 15:25:36.054431946 +0200
|
|
@@ -513,14 +513,13 @@
|
|
'nodocs': rpm.RPMTRANS_FLAG_NODOCS,
|
|
'test': rpm.RPMTRANS_FLAG_TEST,
|
|
'justdb': rpm.RPMTRANS_FLAG_JUSTDB,
|
|
- 'nocontexts': rpm.RPMTRANS_FLAG_NOCONTEXTS,
|
|
- 'nocrypto': rpm.RPMTRANS_FLAG_NOFILEDIGEST}
|
|
+ 'nocontexts': 0,
|
|
+ 'nocrypto': 0}
|
|
if hasattr(rpm, 'RPMTRANS_FLAG_NOCAPS'):
|
|
# Introduced in rpm-4.14
|
|
_TS_FLAGS_TO_RPM['nocaps'] = rpm.RPMTRANS_FLAG_NOCAPS
|
|
|
|
- _TS_VSFLAGS_TO_RPM = {'nocrypto': rpm._RPMVSF_NOSIGNATURES |
|
|
- rpm._RPMVSF_NODIGESTS}
|
|
+ _TS_VSFLAGS_TO_RPM = {'nocrypto': rpm.RPMVSF_NODSAHEADER}
|
|
|
|
@property
|
|
def goal(self):
|
|
@@ -1675,7 +1674,7 @@
|
|
|
|
installroot = self.conf.installroot
|
|
myts = dnf.rpm.transaction.initReadOnlyTransaction(root=installroot)
|
|
- myts.pushVSFlags(~(rpm._RPMVSF_NOSIGNATURES | rpm._RPMVSF_NODIGESTS))
|
|
+ myts.pushVSFlags(~(rpm.RPMVSF_NODSAHEADER))
|
|
idx = myts.dbMatch('name', 'gpg-pubkey')
|
|
keys = len(idx)
|
|
del idx
|
|
Only in dnf-4.0.4/dnf: base.py.orig
|
|
Only in dnf-4.0.4/dnf: base.py.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:21:54.000000000 +0200
|
|
+++ dnf-4.0.4/dnf/rpm/__init__.py 2019-06-02 15:24:13.154063464 +0200
|
|
@@ -31,7 +31,7 @@
|
|
"""Calculate the release version for the system."""
|
|
|
|
ts = transaction.initReadOnlyTransaction(root=installroot)
|
|
- ts.pushVSFlags(~(rpm._RPMVSF_NOSIGNATURES | rpm._RPMVSF_NODIGESTS))
|
|
+ ts.pushVSFlags(~(rpm.RPMVSF_NODSAHEADER))
|
|
for distroverpkg in dnf.const.DISTROVERPKG:
|
|
if dnf.pycomp.PY3:
|
|
distroverpkg = bytes(distroverpkg, 'utf-8')
|
|
Only in dnf-4.0.4/dnf/rpm: __init__.py.orig
|
|
diff -ru dnf-4.0.4.orig/dnf/rpm/transaction.py dnf-4.0.4/dnf/rpm/transaction.py
|
|
--- dnf-4.0.4.orig/dnf/rpm/transaction.py 2019-06-02 15:21:54.000000000 +0200
|
|
+++ dnf-4.0.4/dnf/rpm/transaction.py 2019-06-02 15:24:13.154063464 +0200
|
|
@@ -119,5 +119,5 @@
|
|
|
|
def initReadOnlyTransaction(root='/'):
|
|
read_ts = TransactionWrapper(root=root)
|
|
- read_ts.pushVSFlags((rpm._RPMVSF_NOSIGNATURES|rpm._RPMVSF_NODIGESTS))
|
|
+ read_ts.pushVSFlags(rpm.RPMVSF_NODSAHEADER)
|
|
return read_ts
|