Backport more patches

* resend ostree message in case signer crashed and missed it
* stop filtering environments from Everything

0001-Revert-Move-ostree-phase-and-pipelines-for-running-p.patch

@@ -1,7 +1,7 @@
 From fa0ed11ee0c733e9c3e4785f6526ef889109111c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
 Date: Wed, 11 Apr 2018 09:18:59 +0200
-Subject: [PATCH 1/5] Revert "Move ostree phase and pipelines for running
+Subject: [PATCH 1/7] Revert "Move ostree phase and pipelines for running
  phases"
 
 This reverts commit 660c04368ba1abed310f121d01f0fa029eea5f11.

0002-Revert-Other-repo-for-OstreeInstaller.patch

@@ -1,7 +1,7 @@
 From c62eb8dd27bc17406649e3560223f20b690de63f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
 Date: Wed, 11 Apr 2018 09:19:53 +0200
-Subject: [PATCH 2/5] Revert "Other repo for OstreeInstaller"
+Subject: [PATCH 2/7] Revert "Other repo for OstreeInstaller"
 
 This reverts commit 5c081cb545715c2a912ff50fa57554e89d905868.
 ---

0003-Revert-Ostree-can-use-pkgset-repos.patch

@@ -1,7 +1,7 @@
 From f51543a24a35145ecbc60e86951accf5369df364 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
 Date: Wed, 11 Apr 2018 09:20:51 +0200
-Subject: [PATCH 3/5] Revert "Ostree can use pkgset repos"
+Subject: [PATCH 3/7] Revert "Ostree can use pkgset repos"
 
 This reverts commit c7cc200246300c6a3946b2e3a9f5f7693896a7d6.
 ---

0004-Update-tests-for-libmodulemd-1.4.0.patch

@@ -1,7 +1,7 @@
 From c2fb790652ab9b6f1b03ebd61e70838c0695d1fd Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
 Date: Wed, 2 May 2018 15:36:52 +0200
-Subject: [PATCH 4/5] Update tests for libmodulemd 1.4.0
+Subject: [PATCH 4/7] Update tests for libmodulemd 1.4.0
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

0005-ostree-installer-Copy-files-without-owner.patch

@@ -1,7 +1,7 @@
 From 52a3c87c71522db59191f1f7e4e66cee72e67bf5 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
 Date: Fri, 4 May 2018 08:58:34 +0200
-Subject: [PATCH 5/5] ostree-installer: Copy files without owner
+Subject: [PATCH 5/7] ostree-installer: Copy files without owner
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

0006-Make-wait-for-signed-ostree-repeat-the-fedmsg-in-cas.patch

@@ -0,0 +1,48 @@
+From 155e60563a6f1a2d593525e563a8e45a4fc4f38c Mon Sep 17 00:00:00 2001
+From: Patrick Uiterwijk <puiterwijk@redhat.com>
+Date: Wed, 9 May 2018 23:17:59 +0200
+Subject: [PATCH 6/7] Make wait-for-signed-ostree repeat the fedmsg in case the
+ signer crashed
+
+Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
+---
+ bin/pungi-wait-for-signed-ostree-handler | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/bin/pungi-wait-for-signed-ostree-handler b/bin/pungi-wait-for-signed-ostree-handler
+index 98c02031..25997993 100755
+--- a/bin/pungi-wait-for-signed-ostree-handler
++++ b/bin/pungi-wait-for-signed-ostree-handler
+@@ -5,6 +5,7 @@ from __future__ import print_function
+ 
+ import argparse
+ import datetime
++import fedmsg.config
+ import json
+ import os
+ import sys
+@@ -29,9 +30,21 @@ if __name__ == '__main__':
+     commit = data['commitid']
+     path = '%s/objects/%s/%s.commitmeta' % (repo, commit[:2], commit[2:])
+ 
++    config = fedmsg.config.load_config()
++    config['active'] = True           # Connect out to a fedmsg-relay instance
++    config['cert_prefix'] = 'releng'  # Use this cert.
++    fedmsg.init(**config)
++    topic = 'compose.%s' % opts.cmd.replace('-', '.').lower()
++
++    count = 0
+     while not os.path.exists(path):
+         print('%s: Commit not signed yet, waiting...'
+               % datetime.datetime.utcnow())
++        count += 1
++        if count >= 60:  # Repeat every 5 minutes
++            print('Repeating notification')
++            fedmsg.publish(topic=topic, modname='pungi', msg=data)
++            count = 0
+         time.sleep(5)
+ 
+     print('Found signature.')
+-- 
+2.14.3
+

0007-init-Stop-filtering-comps-environments-all-the-time.patch

@@ -0,0 +1,38 @@
+From 5d0e7911e080d4244a071b9af441bcff88b8c6cf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
+Date: Thu, 10 May 2018 08:58:33 +0200
+Subject: [PATCH 7/7] init: Stop filtering comps environments all the time
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+For variants that contain all packages (Fedora's Everything) we don't
+want to lose any environments.
+
+Fixes: https://pagure.io/pungi/issue/940
+Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
+---
+ pungi/phases/init.py | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/pungi/phases/init.py b/pungi/phases/init.py
+index a8dcc967..4b9916d1 100644
+--- a/pungi/phases/init.py
++++ b/pungi/phases/init.py
+@@ -128,7 +128,12 @@ def write_variant_comps(compose, arch, variant):
+         unmatched = comps.filter_groups(variant.groups)
+         for grp in unmatched:
+             compose.log_warning(UNMATCHED_GROUP_MSG % (variant.uid, arch, grp))
+-    if compose.conf["comps_filter_environments"]:
++    contains_all = not variant.groups and not variant.environments
++    if compose.conf["comps_filter_environments"] and not contains_all:
++        # We only want to filter environments if it's enabled by configuration
++        # and it's a variant with some groups and environements defined. If
++        # there are none, all packages should go in there and also all
++        # environments should be preserved.
+         comps.filter_environments(variant.environments)
+     comps.write_comps()
+ 
+-- 
+2.14.3
+

pungi.spec

@@ -1,6 +1,6 @@
 Name:           pungi
 Version:        4.1.24
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Distribution compose tool
 
 Group:          Development/Tools
@@ -12,6 +12,8 @@ Patch1:         0002-Revert-Other-repo-for-OstreeInstaller.patch
 Patch2:         0003-Revert-Ostree-can-use-pkgset-repos.patch
 Patch3:         0004-Update-tests-for-libmodulemd-1.4.0.patch
 Patch4:         0005-ostree-installer-Copy-files-without-owner.patch
+Patch5:         0006-Make-wait-for-signed-ostree-repeat-the-fedmsg-in-cas.patch
+Patch6:         0007-init-Stop-filtering-comps-environments-all-the-time.patch
 
 BuildRequires:  python3-nose
 BuildRequires:  python3-mock
@@ -178,6 +180,10 @@ nosetests-3 --exe
 %{_bindir}/%{name}-wait-for-signed-ostree-handler
 
 %changelog
+* Thu May 10 2018 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.24-3
+- Make wait-for-signed-ostree repeat the fedmsg in case the signer crashed
+- Stop filtering comps environments all the time
+
 * Fri May 04 2018 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.24-2
 - Copy ostree-installer without preserving owner