diff --git a/.atomic.metadata b/.atomic.metadata index 8fbc033..757ade9 100644 --- a/.atomic.metadata +++ b/.atomic.metadata @@ -1 +1 @@ -075b9aec68119d72e8efdb1e40989edd54ae4669 SOURCES/a21f0bc7a69baafb87d247ad87a6eabfb551d431.tar.gz +1637965eeec076e8e40eb4af5a675f4c27515b39 SOURCES/241adc115aa6e7975e180c3d97e2e6be4bf38325.tar.gz diff --git a/.gitignore b/.gitignore index c156b55..731efdb 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/a21f0bc7a69baafb87d247ad87a6eabfb551d431.tar.gz +SOURCES/241adc115aa6e7975e180c3d97e2e6be4bf38325.tar.gz diff --git a/SOURCES/fix-re-module-bug.patch b/SOURCES/fix-re-module-bug.patch deleted file mode 100644 index 824c075..0000000 --- a/SOURCES/fix-re-module-bug.patch +++ /dev/null @@ -1,38 +0,0 @@ -From df95392e3bd6d8d7f85f5588ada8451fc0b36266 Mon Sep 17 00:00:00 2001 -From: Aaron Weitekamp -Date: Tue, 14 Feb 2017 09:58:40 -0500 -Subject: [PATCH] fix re module bug - -Closes: #891 -Approved by: rhatdan ---- - Atomic/util.py | 2 +- - tests/unit/test_util.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Atomic/util.py b/Atomic/util.py -index b75327a..d374dd8 100644 ---- a/Atomic/util.py -+++ b/Atomic/util.py -@@ -750,7 +750,7 @@ def is_valid_image_uri(uri, qualifying=None): - # does it parse? - token = urlparse("http://" + uri, allow_fragments=False) - # check registry component -- registry_pattern = re.compile(r'^[a-zA-Z0-9-_\.]+:?([0-9]*)?$') -+ registry_pattern = re.compile(r'^[a-zA-Z0-9-_\.]+\/?:?[0-9]*[a-z0-9-\/:]*$') - if not re.search(registry_pattern, token.netloc): - raise ValueError("Invalid registry format") - # check repository component -diff --git a/tests/unit/test_util.py b/tests/unit/test_util.py -index a940cf3..d552cbd 100644 ---- a/tests/unit/test_util.py -+++ b/tests/unit/test_util.py -@@ -90,7 +90,7 @@ def test_decompose(self): - @unittest.skipUnless(new_enough, "Requires 2.7.6 or newer") - def test_valid_uri(self): - valid_uris = ['example.com', 'example.com:5000', 'example.US.com', 'example.com/image/name:version1', 'example.com:5000/foo/bar/image:tag', 'example_inc.com'] -- invalid_uris = ['example.com/Image/name', 'example.com/image(name):latest', 'example.com/foo_bar', 'example.com:5000:8888', 'example.com:foo', 'example[us].com', 'example.com#foo/bar'] -+ invalid_uris = ['example.com/Image/name', 'example.com/image(name):latest', 'example.com/foo_bar', 'example[us].com', 'example.com#foo/bar'] - for uri in valid_uris: - self.assertTrue(util.is_valid_image_uri(uri)) - diff --git a/SPECS/atomic.spec b/SPECS/atomic.spec index 0557889..7444734 100644 --- a/SPECS/atomic.spec +++ b/SPECS/atomic.spec @@ -13,19 +13,17 @@ %global pylint python3-pylint %endif -%global commit0 a21f0bc7a69baafb87d247ad87a6eabfb551d431 +%global commit0 241adc115aa6e7975e180c3d97e2e6be4bf38325 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: atomic Epoch: 1 -Version: 1.15.4 -Release: 2%{?dist} +Version: 1.16.5 +Release: 1%{?dist} Summary: Tool for managing ProjectAtomic systems and containers License: LGPLv2+ URL: https://github.com/projectatomic/%{name} -ExclusiveArch: x86_64 Source0: https://github.com/projectatomic/%{name}/archive/%{commit0}.tar.gz -Patch0: fix-re-module-bug.patch BuildRequires: %{pypkg}-dateutil BuildRequires: %{pypkg}-devel @@ -42,6 +40,7 @@ BuildRequires: go-md2man BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} >= 1.7.4 BuildRequires: rpm-%{pypkg} BuildRequires: PyYAML +BuildRequires: ostree-devel Requires: dbus Requires: polkit @@ -60,6 +59,7 @@ Requires: skopeo >= 1:0.1.17-1 Requires: skopeo-containers >= 1:0.1.17-1 Requires: PyYAML Requires: gomtree +Requires: ostree %description The goal of Atomic is to provide a high level, coherent entrypoint to the @@ -130,6 +130,16 @@ rm -rf %{buildroot}%{_sysconfdir}/containers %dir %{_sysconfdir}/%{name}.d %changelog +* Tue Mar 21 2017 Dan Walsh - 1.16.5-1 +- bump to v1.16.5 +- Fix outdated container image message (BZ 1434430) +- syscontainers: do not delete previous deployment on update +- Atomic/mount.py: Allow different binary paths +- Fix email address + +* Fri Mar 17 2017 Lokesh Mandvekar - 1:1.16.4-2 +- built @projectatomic/master commit 5e5800e + * Wed Feb 15 2017 Lokesh Mandvekar - 1:1.15.4-2 - built commit a21f0bc + re module bug patch