dnf/dnf-2.7.5-rpm5.patch

49 lines
2.2 KiB
Diff

diff -ru dnf-2.7.5.orig/dnf/base.py dnf-2.7.5/dnf/base.py
--- dnf-2.7.5.orig/dnf/base.py 2019-06-01 09:35:45.000000000 +0200
+++ dnf-2.7.5/dnf/base.py 2019-06-01 11:41:34.731888285 +0200
@@ -473,10 +473,9 @@
'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}
- _TS_VSFLAGS_TO_RPM = {'nocrypto': rpm._RPMVSF_NOSIGNATURES |
- rpm._RPMVSF_NODIGESTS}
+ 'nocontexts': 0,
+ 'nocrypto': 0}
+ _TS_VSFLAGS_TO_RPM = {'nocrypto': rpm.RPMVSF_NODSAHEADER}
@property
def _ts(self):
@@ -1663,7 +1662,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
diff -ru dnf-2.7.5.orig/dnf/rpm/__init__.py dnf-2.7.5/dnf/rpm/__init__.py
--- dnf-2.7.5.orig/dnf/rpm/__init__.py 2019-06-01 09:35:45.000000000 +0200
+++ dnf-2.7.5/dnf/rpm/__init__.py 2019-06-01 11:40:28.590565110 +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:
try:
idx = ts.dbMatch('provides', distroverpkg)
diff -ru dnf-2.7.5.orig/dnf/rpm/transaction.py dnf-2.7.5/dnf/rpm/transaction.py
--- dnf-2.7.5.orig/dnf/rpm/transaction.py 2019-06-01 09:35:45.000000000 +0200
+++ dnf-2.7.5/dnf/rpm/transaction.py 2019-06-01 11:40:28.591565115 +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