| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | RPM5 has removed support for RPMVSF_NOSIGNATURES |
| 2 | |
| 3 | Patch smart to no longer use this flag |
| 4 | |
| 5 | Upstream-Status: Pending |
| 6 | |
| 7 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
| 8 | |
| 9 | diff --git a/smart/backends/rpm/base.py b/smart/backends/rpm/base.py |
| 10 | --- a/smart/backends/rpm/base.py |
| 11 | +++ b/smart/backends/rpm/base.py |
| 12 | @@ -63,11 +63,11 @@ def getTS(new=False): |
| 13 | if sysconf.get("rpm-dbpath"): |
| 14 | rpm.addMacro('_dbpath', "/" + sysconf.get("rpm-dbpath")) |
| 15 | getTS.ts = rpm.ts(getTS.root) |
| 16 | - if not sysconf.get("rpm-check-signatures", False): |
| 17 | - if hasattr(rpm, '_RPMVSF_NOSIGNATURES'): |
| 18 | - getTS.ts.setVSFlags(rpm._RPMVSF_NOSIGNATURES) |
| 19 | - else: |
| 20 | - raise Error, _("rpm requires checking signatures") |
| 21 | + #if not sysconf.get("rpm-check-signatures", False): |
| 22 | + # if hasattr(rpm, '_RPMVSF_NOSIGNATURES'): |
| 23 | + # getTS.ts.setVSFlags(rpm._RPMVSF_NOSIGNATURES) |
| 24 | + # else: |
| 25 | + # raise Error, _("rpm requires checking signatures") |
| 26 | rpm_dbpath = sysconf.get("rpm-dbpath", "var/lib/rpm") |
| 27 | dbdir = rpm_join_dbpath(getTS.root, rpm_dbpath) |
| 28 | if not os.path.isdir(dbdir): |
| 29 | @@ -89,11 +89,11 @@ def getTS(new=False): |
| 30 | if sysconf.get("rpm-dbpath"): |
| 31 | rpm.addMacro('_dbpath', "/" + sysconf.get("rpm-dbpath")) |
| 32 | ts = rpm.ts(getTS.root) |
| 33 | - if not sysconf.get("rpm-check-signatures", False): |
| 34 | - if hasattr(rpm, '_RPMVSF_NOSIGNATURES'): |
| 35 | - ts.setVSFlags(rpm._RPMVSF_NOSIGNATURES) |
| 36 | - else: |
| 37 | - raise Error, _("rpm requires checking signatures") |
| 38 | + #if not sysconf.get("rpm-check-signatures", False): |
| 39 | + # if hasattr(rpm, '_RPMVSF_NOSIGNATURES'): |
| 40 | + # ts.setVSFlags(rpm._RPMVSF_NOSIGNATURES) |
| 41 | + # else: |
| 42 | + # raise Error, _("rpm requires checking signatures") |
| 43 | return ts |
| 44 | else: |
| 45 | return getTS.ts |
| 46 | diff --git a/smart/plugins/yumchannelsync.py b/smart/plugins/yumchannelsync.py |
| 47 | --- a/smart/plugins/yumchannelsync.py |
| 48 | +++ b/smart/plugins/yumchannelsync.py |
| 49 | @@ -56,8 +56,8 @@ def _getreleasever(): |
| 50 | |
| 51 | rpmroot = sysconf.get("rpm-root", "/") |
| 52 | ts = rpmUtils.transaction.initReadOnlyTransaction(root=rpmroot) |
| 53 | - if hasattr(rpm, '_RPMVSF_NOSIGNATURES') and hasattr(rpm, '_RPMVSF_NODIGESTS'): |
| 54 | - ts.pushVSFlags(~(rpm._RPMVSF_NOSIGNATURES|rpm._RPMVSF_NODIGESTS)) |
| 55 | + #if hasattr(rpm, '_RPMVSF_NOSIGNATURES') and hasattr(rpm, '_RPMVSF_NODIGESTS'): |
| 56 | + # ts.pushVSFlags(~(rpm._RPMVSF_NOSIGNATURES|rpm._RPMVSF_NODIGESTS)) |
| 57 | releasever = None |
| 58 | # HACK: we're hard-coding the most used distros, will add more if needed |
| 59 | idx = ts.dbMatch('provides', 'fedora-release') |