From 29f93c20d3c14c01686714406649b12da2823c45 Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Tue, 1 Nov 2016 11:09:05 +0900 Subject: [PATCH] Imported Upstream version 15.21.7 Change-Id: I3e9aafa2ac462b0ffe9ba1b143b92ced2d3f02d1 Signed-off-by: DongHun Kwak --- VERSION.cmake | 4 ++-- package/libzypp.changes | 6 ++++++ zypp/parser/RepoindexFileReader.cc | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index 04cfc40..109e747 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -61,8 +61,8 @@ SET(LIBZYPP_MAJOR "15") SET(LIBZYPP_COMPATMINOR "19") SET(LIBZYPP_MINOR "21") -SET(LIBZYPP_PATCH "6") +SET(LIBZYPP_PATCH "7") # -# LAST RELEASED: 15.21.6 (19) +# LAST RELEASED: 15.21.7 (19) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff --git a/package/libzypp.changes b/package/libzypp.changes index 59e2b09..fe72097 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Apr 18 15:03:13 CEST 2016 - ma@suse.de + +- RepoindexFileReader: fix service metadata TTL default value (bsc#967828) +- version 15.21.7 (19) + +------------------------------------------------------------------- Fri Apr 15 11:31:08 CEST 2016 - ma@suse.de - DiskUsageCounter: Limit estimated waste per file (bsc#974275) diff --git a/zypp/parser/RepoindexFileReader.cc b/zypp/parser/RepoindexFileReader.cc index a06effb..5414d0c 100644 --- a/zypp/parser/RepoindexFileReader.cc +++ b/zypp/parser/RepoindexFileReader.cc @@ -113,7 +113,7 @@ namespace zypp */ bool consumeNode( Reader & reader_r ); - DefaultIntegral _ttl; + DefaultIntegral _ttl; private: bool getAttrValue( const std::string & key_r, Reader & reader_r, std::string & value_r ) -- 2.7.4