keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

core: Canonicalize an epoch of zero to the empty string

Browse Source 
We have two different codepaths for creating a cache branch header
string, one from libdnf, and one from librpm.  It turns out if
an RPM package explicitly specifies an `Epoch: 0` like various Fedora
perl subpackages do, these are different.

Explicitly convert `0:` to the empty string to make them match, and
hence installation will work.

Closes: https://github.com/projectatomic/rpm-ostree/issues/349

Closes: #482
Approved by: jlebon
This commit is contained in:
Colin Walters 2016-10-12 13:00:29 -04:00 committed by Atomic Bot
parent b32bc75b6c
commit 56f3f509a1
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/libpriv/rpmostree-core.c
View File

@ -729,6 +729,15 @@ cache_branch_for_n_evr_a (const char *name, const char *evr, const char *arch)
GString *r = g_string_new ("rpmostree/pkg/");
append_quoted (r, name);
g_string_append_c (r, '/');
/* Work around the fact that libdnf and librpm have different handling
* for an explicit Epoch header of zero. libdnf right now ignores it,
* but librpm will add an explicit 0:. Since there's no good reason
* to have it, let's follow the lead of libdnf.
*
* https://github.com/projectatomic/rpm-ostree/issues/349
*/
if (g_str_has_prefix (evr, "0:"))
evr += 2;
append_quoted (r, evr);
g_string_append_c (r, '.');
append_quoted (r, arch);