2017.9-1: new upstream version
Also bump requirement on libostree for multiple things, including `OSTREE_REPO_CHECKOUT_OVERWRITE_UNION_IDENTICAL`.
This commit is contained in:
Jonathan Lebon
parent
90722b718c
commit
4bd8b46192
1
.gitignore
vendored
1
.gitignore
vendored
@ -52,3 +52,4 @@
|
||||
/rpm-ostree-2017.6.67.g417a3d8.tar.xz
|
||||
/rpm-ostree-2017.7.tar.xz
|
||||
/rpm-ostree-2017.8.tar.xz
|
||||
/rpm-ostree-2017.9.tar.xz
|
||||
|
||||
@ -1,167 +0,0 @@
|
||||
From 1e7eee85873000a3f75d5d5b665b0d2dbbecce00 Mon Sep 17 00:00:00 2001
|
||||
From: Jonathan Lebon <jlebon@redhat.com>
|
||||
Date: Mon, 21 Aug 2017 15:55:52 -0400
|
||||
Subject: [PATCH] DnfRepo: allow metadata_expire value of 0
|
||||
|
||||
Many repos have metadata_expire=0 to mean immediate expiry. We change
|
||||
the parser here to uphold this. We also change the default metadata
|
||||
expiry cache to be 48h, which is in line with what dnf currently does:
|
||||
|
||||
https://github.com/rpm-software-management/dnf/blob/3f23e646e4543e9be14cc89795ff8e529595f4c6/dnf/conf/config.py#L716
|
||||
|
||||
I also changed the parsing function to return a gboolean to make error
|
||||
handling easier.
|
||||
|
||||
See also: https://github.com/projectatomic/rpm-ostree/issues/930
|
||||
---
|
||||
libdnf/libdnf/dnf-repo.c | 57 +++++++++++++++++++++++--------------------------------
|
||||
1 file changed, 24 insertions(+), 33 deletions(-)
|
||||
|
||||
diff --git a/libdnf/libdnf/dnf-repo.c b/libdnf/libdnf/dnf-repo.c
|
||||
index c948d93..1f87d77 100644
|
||||
--- a/libdnf/libdnf/dnf-repo.c
|
||||
+++ b/libdnf/libdnf/dnf-repo.c
|
||||
@@ -758,7 +758,7 @@ dnf_repo_set_keyfile(DnfRepo *repo, GKeyFile *keyfile)
|
||||
* @repo: a #DnfRepo instance.
|
||||
* @metadata_expire: the expected expiry time for metadata
|
||||
*
|
||||
- * Sets the metadata_expire time, which is default to be 0 days
|
||||
+ * Sets the metadata_expire time, which defaults to 48h.
|
||||
**/
|
||||
void
|
||||
dnf_repo_set_metadata_expire(DnfRepo *repo, guint metadata_expire)
|
||||
@@ -770,6 +770,7 @@ dnf_repo_set_metadata_expire(DnfRepo *repo, guint metadata_expire)
|
||||
/**
|
||||
* dnf_repo_parse_time_from_str
|
||||
* @expression: a expression to be parsed
|
||||
+ * @out_parsed_time: (out): return location for parsed time
|
||||
* @error: error item
|
||||
*
|
||||
* Parse String into an integer value of seconds, or a human
|
||||
@@ -784,24 +785,26 @@ dnf_repo_set_metadata_expire(DnfRepo *repo, guint metadata_expire)
|
||||
* Returns: integer value in seconds
|
||||
**/
|
||||
|
||||
-static guint
|
||||
-dnf_repo_parse_time_from_str(const gchar *expression, GError **error)
|
||||
+static gboolean
|
||||
+dnf_repo_parse_time_from_str(const gchar *expression, guint *out_parsed_time, GError **error)
|
||||
{
|
||||
gint multiplier;
|
||||
gdouble parsed_time;
|
||||
gchar *endptr = NULL;
|
||||
- guint result;
|
||||
|
||||
if (!g_strcmp0(expression, "")) {
|
||||
g_set_error_literal(error,
|
||||
DNF_ERROR,
|
||||
DNF_ERROR_FILE_INVALID,
|
||||
"no metadata value specified");
|
||||
- return 0;
|
||||
+ return FALSE;
|
||||
}
|
||||
|
||||
- if (g_strcmp0(expression, "-1") == 0 || g_strcmp0(expression,"never") == 0)
|
||||
- return G_MAXUINT;
|
||||
+ if (g_strcmp0(expression, "-1") == 0 ||
|
||||
+ g_strcmp0(expression,"never") == 0) {
|
||||
+ *out_parsed_time = G_MAXUINT;
|
||||
+ return TRUE; /* Note early return */
|
||||
+ }
|
||||
|
||||
gchar last_char = expression[ strlen(expression) - 1 ];
|
||||
|
||||
@@ -818,7 +821,7 @@ dnf_repo_parse_time_from_str(const gchar *expression, GError **error)
|
||||
else {
|
||||
g_set_error(error, DNF_ERROR, DNF_ERROR_FILE_INVALID,
|
||||
"unknown unit %c", last_char);
|
||||
- return 0;
|
||||
+ return FALSE;
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -831,33 +834,25 @@ dnf_repo_parse_time_from_str(const gchar *expression, GError **error)
|
||||
if (expression == endptr) {
|
||||
g_set_error(error, DNF_ERROR, DNF_ERROR_INTERNAL_ERROR,
|
||||
"failed to parse time: %s", expression);
|
||||
- return 0;
|
||||
+ return FALSE;
|
||||
}
|
||||
|
||||
/* time can not be below zero */
|
||||
if (parsed_time < 0) {
|
||||
g_set_error(error, DNF_ERROR, DNF_ERROR_INTERNAL_ERROR,
|
||||
"seconds value must not be negative %s",expression );
|
||||
- return 0;
|
||||
+ return FALSE;
|
||||
}
|
||||
|
||||
/* time too large */
|
||||
if (parsed_time > G_MAXDOUBLE || (parsed_time * multiplier) > G_MAXUINT){
|
||||
g_set_error(error, DNF_ERROR, DNF_ERROR_INTERNAL_ERROR,
|
||||
"time too large");
|
||||
- return 0;
|
||||
+ return FALSE;
|
||||
}
|
||||
- result = (guint) (parsed_time * multiplier);
|
||||
|
||||
- /* for the case where time is too small (i.e result = 0) */
|
||||
- if (result == 0) {
|
||||
- g_set_error_literal(error,
|
||||
- DNF_ERROR,
|
||||
- DNF_ERROR_FILE_INVALID,
|
||||
- "metadata expire time too small, has to be at least one second");
|
||||
- }
|
||||
-
|
||||
- return result;
|
||||
+ *out_parsed_time = (guint) (parsed_time * multiplier);
|
||||
+ return TRUE;
|
||||
}
|
||||
/**
|
||||
* dnf_repo_get_username_password_string:
|
||||
@@ -910,7 +905,6 @@ dnf_repo_set_keyfile_data(DnfRepo *repo, GError **error)
|
||||
{
|
||||
DnfRepoPrivate *priv = GET_PRIVATE(repo);
|
||||
guint cost;
|
||||
- guint metadata_expire;
|
||||
g_autofree gchar *metadata_expire_str = NULL;
|
||||
g_autofree gchar *mirrorlist = NULL;
|
||||
g_autofree gchar *mirrorlisturl = NULL;
|
||||
@@ -946,13 +940,13 @@ dnf_repo_set_keyfile_data(DnfRepo *repo, GError **error)
|
||||
/* metadata_expire is optional, if shown, we parse the string to add the time */
|
||||
metadata_expire_str = g_key_file_get_string(priv->keyfile, priv->id, "metadata_expire", NULL);
|
||||
if (metadata_expire_str) {
|
||||
- metadata_expire = dnf_repo_parse_time_from_str(metadata_expire_str , error);
|
||||
-
|
||||
- /* we assume zero is default, and when string exist, 0 seconds is assumed to be error */
|
||||
- if (metadata_expire != 0)
|
||||
- dnf_repo_set_metadata_expire(repo, metadata_expire);
|
||||
- else
|
||||
+ guint metadata_expire;
|
||||
+ if (!dnf_repo_parse_time_from_str(metadata_expire_str, &metadata_expire, error))
|
||||
return FALSE;
|
||||
+ dnf_repo_set_metadata_expire(repo, metadata_expire);
|
||||
+ } else {
|
||||
+ /* default to 48h; this is in line with dnf's default */
|
||||
+ dnf_repo_set_metadata_expire(repo, 60 * 60 * 48);
|
||||
}
|
||||
|
||||
/* the "mirrorlist" entry could be either a real mirrorlist, or a metalink entry */
|
||||
@@ -1355,12 +1349,9 @@ dnf_repo_check_internal(DnfRepo *repo,
|
||||
return FALSE;
|
||||
age_of_data =(g_get_real_time() - priv->timestamp_modified) / G_USEC_PER_SEC;
|
||||
|
||||
- /*choose a lower value between cache and metadata_expire for expired checking */
|
||||
+ /* choose a lower value between cache and metadata_expire for expired checking */
|
||||
metadata_expire = dnf_repo_get_metadata_expire(repo);
|
||||
- if (metadata_expire != 0)
|
||||
- valid_time_allowed = metadata_expire <= permissible_cache_age ? metadata_expire : permissible_cache_age;
|
||||
- else
|
||||
- valid_time_allowed = permissible_cache_age;
|
||||
+ valid_time_allowed = (metadata_expire <= permissible_cache_age ? metadata_expire : permissible_cache_age);
|
||||
|
||||
if (age_of_data > valid_time_allowed) {
|
||||
g_set_error(error,
|
||||
--
|
||||
2.14.0
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
Summary: Hybrid image/package system
|
||||
Name: rpm-ostree
|
||||
Version: 2017.8
|
||||
Release: 2%{?dist}
|
||||
Version: 2017.9
|
||||
Release: 1%{?dist}
|
||||
#VCS: https://github.com/cgwalters/rpm-ostree
|
||||
# This tarball is generated via "make -f Makefile.dist-packaging dist-snapshot"
|
||||
Source0: rpm-ostree-%{version}.tar.xz
|
||||
@ -18,7 +18,7 @@ BuildRequires: gperf
|
||||
BuildRequires: gnome-common
|
||||
BuildRequires: /usr/bin/g-ir-scanner
|
||||
# Core requirements
|
||||
BuildRequires: pkgconfig(ostree-1) >= 2017.10
|
||||
BuildRequires: pkgconfig(ostree-1) >= 2017.11
|
||||
BuildRequires: pkgconfig(polkit-gobject-1)
|
||||
BuildRequires: pkgconfig(json-glib-1.0)
|
||||
BuildRequires: pkgconfig(rpm)
|
||||
@ -30,8 +30,6 @@ BuildRequires: libattr-devel
|
||||
# We currently interact directly with librepo
|
||||
BuildRequires: pkgconfig(librepo)
|
||||
|
||||
Patch0: 0001-DnfRepo-allow-metadata_expire-value-of-0.patch
|
||||
|
||||
# libdnf bundling
|
||||
# We're using RPATH to pick up our bundled version
|
||||
%global __requires_exclude ^libdnf[.]so[.].*$
|
||||
@ -151,6 +149,9 @@ python autofiles.py > files.devel \
|
||||
%files devel -f files.devel
|
||||
|
||||
%changelog
|
||||
* Mon Sep 25 2017 Jonathan Lebon <jlebon@redhat.com> - 2017.9-1
|
||||
- New upstream version
|
||||
|
||||
* Mon Aug 21 2017 Jonathan Lebon <jlebon@redhat.com> - 2017.8-2
|
||||
- Patch to allow metadata_expire=0
|
||||
https://github.com/projectatomic/rpm-ostree/issues/930
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (rpm-ostree-2017.8.tar.xz) = c455eeb83bcfdfd02707f1fffab8cf5936c10bec65406166b2ed679c2410ba5b3543831efce7eb57ad4299942da684894b77b63799813aaeafb23b75f32276d4
|
||||
SHA512 (rpm-ostree-2017.9.tar.xz) = 25a0dd61daff3b0216fe4c2458807da08decfaecd02b5059aae0912eb1ecbbac10cf2251850b4f3db3ffc00a882eb0f8b61e09ca12bfe0f64ebc6cd31bd2252d
|
||||
|
||||
Loading…
Reference in New Issue
Block a user