From e03d432de451370c10e56a70daf06a9bf4d38176 Mon Sep 17 00:00:00 2001 From: Brent Baude Date: May 08 2017 19:25:24 +0000 Subject: Adding small patch temporarily for F25 to stabilize Atomic for F25-AH release --- diff --git a/0001-install.patch b/0001-install.patch new file mode 100644 index 0000000..f738424 --- /dev/null +++ b/0001-install.patch @@ -0,0 +1,13 @@ +diff --git a/Atomic/util.py b/Atomic/util.py +index bb48100..42db51d 100644 +--- a/Atomic/util.py ++++ b/Atomic/util.py +@@ -853,6 +853,8 @@ class InstallData(object): + return True + if install_data.get(img_object.image, None): + return True ++ if install_data.get("{}:{}".format(img_object.input_name, img_object.tag), None): ++ return True + return False + + class Decompose(object): diff --git a/atomic.spec b/atomic.spec index 0585ca1..8cd5ac8 100644 --- a/atomic.spec +++ b/atomic.spec @@ -16,7 +16,7 @@ Name: atomic Version: 1.17.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tool for managing ProjectAtomic systems and containers License: LGPLv2+ URL: https://github.com/projectatomic/atomic @@ -26,6 +26,7 @@ ExclusiveArch: i386 i486 i586 i686 pentium3 pentium4 athlon geode x86_64 armv3l ExclusiveArch: x86_64 ppc64le %endif Source0: https://github.com/projectatomic/%{name}/archive/%{commit}.tar.gz +Patch1: 0001-install.patch BuildRequires: %{pypkg}-devel BuildRequires: %{pypkg}-requests >= 2.4.3 BuildRequires: %{pypkg}-setuptools @@ -101,6 +102,7 @@ The atomic host subcommand wraps rpm-ostree providing unified management. %prep %setup -qn %{name}-%{commit} +%patch1 -p1 if [ %{pypkg} == 'python3' ]; then sed -i 's/input = raw_input/pass/' Atomic/util.py fi @@ -154,6 +156,9 @@ EOF %dir %{_sharedstatedir}/containers/%{name} %changelog +* Mon May 08 2017 bbaude - 1.17.1-4 +- Add small fix to install logic for F25-AH rebuild. + * Wed Apr 26 2017 Colin Walters - 1.17.1-3 - Revert rpmbuild dependency