From dad981b95abf6f99751522bae7fd726c2bb282bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Per=20=C3=98yvind=20Karlsen?= Date: Sat, 12 Feb 2011 15:33:18 +0000 Subject: "fix" problem with gpg-pubkey lacking '.' before non-existant arch (fixes #62401) --- URPM.xs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/URPM.xs b/URPM.xs index 0a11f6f..06dd938 100644 --- a/URPM.xs +++ b/URPM.xs @@ -871,7 +871,7 @@ pack_header(URPM__Package pkg) { const char *group = get_name(pkg->h, RPMTAG_GROUP); const char *nvra = headerFormat(pkg->h, "%{NAME}-%{VERSION}-%{RELEASE}%|DISTTAG?{-%{DISTTAG}%|DISTEPOCH?" - "{%{DISTEPOCH}}|}|%|ARCH?{.%|SOURCERPM?{%{ARCH}}:{src}|}:{}|", + "{%{DISTEPOCH}}|}|.%|ARCH?{%|SOURCERPM?{%{ARCH}}:{src}|}:{}|", NULL ); p += 1 + snprintf(buff, sizeof(buff), "%s@%d@%d@%s", nvra, @@ -1808,7 +1808,7 @@ Pkg_fullname(pkg) if (gimme == G_SCALAR) { const char *nvra = headerFormat(pkg->h, "%{NAME}-%{VERSION}-%{RELEASE}%|DISTTAG?{-%{DISTTAG}%|DISTEPOCH?" - "{%{DISTEPOCH}}|}|%|ARCH?{.%|SOURCERPM?{%{ARCH}}:{src}|}:{}|", + "{%{DISTEPOCH}}|}|.%|ARCH?{%|SOURCERPM?{%{ARCH}}:{src}|}:{}|", NULL ); XPUSHs(sv_2mortal(newSVpvf("%s", nvra))); @@ -2096,7 +2096,7 @@ Pkg_filename(pkg) } else if (pkg->h) { const char *nvra = headerFormat(pkg->h, "%{NAME}-%{VERSION}-%{RELEASE}%|DISTTAG?{-%{DISTTAG}%|DISTEPOCH?" - "{%{DISTEPOCH}}|}|%|ARCH?{.%|SOURCERPM?{%{ARCH}}:{src}|}:{}|", + "{%{DISTEPOCH}}|}|.%|ARCH?{%|SOURCERPM?{%{ARCH}}:{src}|}:{}|", NULL ); @@ -2121,7 +2121,7 @@ Pkg_header_filename(pkg) const char *nvra = headerFormat(pkg->h, "%{NAME}-%{VERSION}-%{RELEASE}%|DISTTAG?{-%{DISTTAG}%|DISTEPOCH?" - "{%{DISTEPOCH}}|}|%|ARCH?{.%|SOURCERPM?{%{ARCH}}:{src}|}:{}|", + "{%{DISTEPOCH}}|}|.%|ARCH?{%|SOURCERPM?{%{ARCH}}:{src}|}:{}|", NULL ); -- cgit v1.2.1