diff options
Diffstat (limited to 'meta/recipes-devtools/python/python-smartpm/smartpm-rpm5-nodig.patch')
| -rw-r--r-- | meta/recipes-devtools/python/python-smartpm/smartpm-rpm5-nodig.patch | 47 |
1 files changed, 30 insertions, 17 deletions
diff --git a/meta/recipes-devtools/python/python-smartpm/smartpm-rpm5-nodig.patch b/meta/recipes-devtools/python/python-smartpm/smartpm-rpm5-nodig.patch index 9919a941bc..fefb29a666 100644 --- a/meta/recipes-devtools/python/python-smartpm/smartpm-rpm5-nodig.patch +++ b/meta/recipes-devtools/python/python-smartpm/smartpm-rpm5-nodig.patch | |||
| @@ -6,41 +6,54 @@ Upstream-Status: Pending | |||
| 6 | 6 | ||
| 7 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | 7 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
| 8 | 8 | ||
| 9 | diff -ur smart-1.4.1.orig/smart/backends/rpm/base.py smart-1.4.1/smart/backends/rpm/base.py | 9 | diff --git a/smart/backends/rpm/base.py b/smart/backends/rpm/base.py |
| 10 | --- smart-1.4.1.orig/smart/backends/rpm/base.py 2012-10-04 11:22:11.229351164 -0500 | 10 | --- a/smart/backends/rpm/base.py |
| 11 | +++ smart-1.4.1/smart/backends/rpm/base.py 2012-10-04 11:22:44.820170786 -0500 | 11 | +++ b/smart/backends/rpm/base.py |
| 12 | @@ -53,8 +53,8 @@ | 12 | @@ -63,11 +63,11 @@ def getTS(new=False): |
| 13 | if sysconf.get("rpm-dbpath"): | 13 | if sysconf.get("rpm-dbpath"): |
| 14 | rpm.addMacro('_dbpath', "/" + sysconf.get("rpm-dbpath")) | 14 | rpm.addMacro('_dbpath', "/" + sysconf.get("rpm-dbpath")) |
| 15 | getTS.ts = rpm.ts(getTS.root) | 15 | getTS.ts = rpm.ts(getTS.root) |
| 16 | - if not sysconf.get("rpm-check-signatures", False): | 16 | - if not sysconf.get("rpm-check-signatures", False): |
| 17 | - getTS.ts.setVSFlags(rpm._RPMVSF_NOSIGNATURES) | 17 | - if hasattr(rpm, '_RPMVSF_NOSIGNATURES'): |
| 18 | - getTS.ts.setVSFlags(rpm._RPMVSF_NOSIGNATURES) | ||
| 19 | - else: | ||
| 20 | - raise Error, _("rpm requires checking signatures") | ||
| 18 | + #if not sysconf.get("rpm-check-signatures", False): | 21 | + #if not sysconf.get("rpm-check-signatures", False): |
| 19 | + # getTS.ts.setVSFlags(rpm._RPMVSF_NOSIGNATURES) | 22 | + # if hasattr(rpm, '_RPMVSF_NOSIGNATURES'): |
| 23 | + # getTS.ts.setVSFlags(rpm._RPMVSF_NOSIGNATURES) | ||
| 24 | + # else: | ||
| 25 | + # raise Error, _("rpm requires checking signatures") | ||
| 20 | rpm_dbpath = sysconf.get("rpm-dbpath", "var/lib/rpm") | 26 | rpm_dbpath = sysconf.get("rpm-dbpath", "var/lib/rpm") |
| 21 | dbdir = os.path.join(getTS.root, rpm_dbpath) | 27 | dbdir = rpm_join_dbpath(getTS.root, rpm_dbpath) |
| 22 | if not os.path.isdir(dbdir): | 28 | if not os.path.isdir(dbdir): |
| 23 | @@ -82,8 +82,8 @@ | 29 | @@ -89,11 +89,11 @@ def getTS(new=False): |
| 24 | if sysconf.get("rpm-dbpath"): | 30 | if sysconf.get("rpm-dbpath"): |
| 25 | rpm.addMacro('_dbpath', "/" + sysconf.get("rpm-dbpath")) | 31 | rpm.addMacro('_dbpath', "/" + sysconf.get("rpm-dbpath")) |
| 26 | ts = rpm.ts(getTS.root) | 32 | ts = rpm.ts(getTS.root) |
| 27 | - if not sysconf.get("rpm-check-signatures", False): | 33 | - if not sysconf.get("rpm-check-signatures", False): |
| 28 | - ts.setVSFlags(rpm._RPMVSF_NOSIGNATURES) | 34 | - if hasattr(rpm, '_RPMVSF_NOSIGNATURES'): |
| 35 | - ts.setVSFlags(rpm._RPMVSF_NOSIGNATURES) | ||
| 36 | - else: | ||
| 37 | - raise Error, _("rpm requires checking signatures") | ||
| 29 | + #if not sysconf.get("rpm-check-signatures", False): | 38 | + #if not sysconf.get("rpm-check-signatures", False): |
| 30 | + # ts.setVSFlags(rpm._RPMVSF_NOSIGNATURES) | 39 | + # if hasattr(rpm, '_RPMVSF_NOSIGNATURES'): |
| 40 | + # ts.setVSFlags(rpm._RPMVSF_NOSIGNATURES) | ||
| 41 | + # else: | ||
| 42 | + # raise Error, _("rpm requires checking signatures") | ||
| 31 | return ts | 43 | return ts |
| 32 | else: | 44 | else: |
| 33 | return getTS.ts | 45 | return getTS.ts |
| 34 | diff -ur smart-1.4.1.orig/smart/plugins/yumchannelsync.py smart-1.4.1/smart/plugins/yumchannelsync.py | 46 | diff --git a/smart/plugins/yumchannelsync.py b/smart/plugins/yumchannelsync.py |
| 35 | --- smart-1.4.1.orig/smart/plugins/yumchannelsync.py 2010-12-06 03:11:05.000000000 -0600 | 47 | --- a/smart/plugins/yumchannelsync.py |
| 36 | +++ smart-1.4.1/smart/plugins/yumchannelsync.py 2012-10-04 11:23:09.799350924 -0500 | 48 | +++ b/smart/plugins/yumchannelsync.py |
| 37 | @@ -56,7 +56,8 @@ | 49 | @@ -56,8 +56,8 @@ def _getreleasever(): |
| 38 | 50 | ||
| 39 | rpmroot = sysconf.get("rpm-root", "/") | 51 | rpmroot = sysconf.get("rpm-root", "/") |
| 40 | ts = rpmUtils.transaction.initReadOnlyTransaction(root=rpmroot) | 52 | ts = rpmUtils.transaction.initReadOnlyTransaction(root=rpmroot) |
| 41 | - ts.pushVSFlags(~(rpm._RPMVSF_NOSIGNATURES|rpm._RPMVSF_NODIGESTS)) | 53 | - if hasattr(rpm, '_RPMVSF_NOSIGNATURES') and hasattr(rpm, '_RPMVSF_NODIGESTS'): |
| 42 | + #ts.pushVSFlags(~(rpm._RPMVSF_NOSIGNATURES|rpm._RPMVSF_NODIGESTS)) | 54 | - ts.pushVSFlags(~(rpm._RPMVSF_NOSIGNATURES|rpm._RPMVSF_NODIGESTS)) |
| 43 | + ts.pushVSFlags(~(rpm._RPMVSF_NODIGESTS)) | 55 | + #if hasattr(rpm, '_RPMVSF_NOSIGNATURES') and hasattr(rpm, '_RPMVSF_NODIGESTS'): |
| 56 | + # ts.pushVSFlags(~(rpm._RPMVSF_NOSIGNATURES|rpm._RPMVSF_NODIGESTS)) | ||
| 44 | releasever = None | 57 | releasever = None |
| 45 | # HACK: we're hard-coding the most used distros, will add more if needed | 58 | # HACK: we're hard-coding the most used distros, will add more if needed |
| 46 | idx = ts.dbMatch('provides', 'fedora-release') | 59 | idx = ts.dbMatch('provides', 'fedora-release') |