diff options
| author | Per Øyvind Karlsen <peroyvind@mandriva.org> | 2011-02-12 15:33:18 +0000 |
|---|---|---|
| committer | Per Øyvind Karlsen <peroyvind@mandriva.org> | 2011-02-12 15:33:18 +0000 |
| commit | dad981b95abf6f99751522bae7fd726c2bb282bb (patch) | |
| tree | 3046ac36bec1c1bc54ac0358e939488947a86ec6 | |
| parent | 27bf5db0922ec99fb3088717928c2ac3e438c7ba (diff) | |
| download | perl-URPM-dad981b95abf6f99751522bae7fd726c2bb282bb.tar perl-URPM-dad981b95abf6f99751522bae7fd726c2bb282bb.tar.gz perl-URPM-dad981b95abf6f99751522bae7fd726c2bb282bb.tar.bz2 perl-URPM-dad981b95abf6f99751522bae7fd726c2bb282bb.tar.xz perl-URPM-dad981b95abf6f99751522bae7fd726c2bb282bb.zip | |
"fix" problem with gpg-pubkey lacking '.' before non-existant arch (fixes #62401)
| -rw-r--r-- | URPM.xs | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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 ); |