diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-06-12 13:56:40 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-06-12 13:56:40 +0000 |
| commit | 0ae6fc1c01e879250b0f0ba12c6dbefe84bea8c6 (patch) | |
| tree | 34e2c42a1bea5045f34bf8fd0d7c46ea38ea7d82 | |
| parent | 20ba103d07067b21f0089892eeae618af73d32ce (diff) | |
| download | perl-URPM-0ae6fc1c01e879250b0f0ba12c6dbefe84bea8c6.tar perl-URPM-0ae6fc1c01e879250b0f0ba12c6dbefe84bea8c6.tar.gz perl-URPM-0ae6fc1c01e879250b0f0ba12c6dbefe84bea8c6.tar.bz2 perl-URPM-0ae6fc1c01e879250b0f0ba12c6dbefe84bea8c6.tar.xz perl-URPM-0ae6fc1c01e879250b0f0ba12c6dbefe84bea8c6.zip | |
- hack on $pkg->is_arch_compat to make it return true for noarch packages
when using rpm 4.4.8 (#31314)
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | URPM.xs | 5 |
2 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,6 @@ +- hack on $pkg->is_arch_compat to make it return true for noarch packages + when using rpm 4.4.8 (#31314) + Version 1.63 - 9 May 2007, by Pascal "Pixel" Rigaux - add $trans->Element_fullname @@ -1342,10 +1342,11 @@ Pkg_is_arch_compat(pkg) get_fullname_parts(pkg, NULL, NULL, NULL, &arch, &eos); *eos = 0; - RETVAL = rpmMachineScore(RPM_MACHTABLE_INSTARCH, arch); + RETVAL = strcmp(arch, "noarch") == 0 ? 4 : rpmMachineScore(RPM_MACHTABLE_INSTARCH, arch); *eos = '@'; } else if (pkg->h && headerIsEntry(pkg->h, RPMTAG_SOURCERPM)) { - RETVAL = rpmMachineScore(RPM_MACHTABLE_INSTARCH, get_name(pkg->h, RPMTAG_ARCH)); + char *arch = get_name(pkg->h, RPMTAG_ARCH); + RETVAL = strcmp(arch, "noarch") == 0 ? 4 : rpmMachineScore(RPM_MACHTABLE_INSTARCH, arch); } else { RETVAL = 0; } |