almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

Stop creating module defaults dir twice

Browse Source
This commit is contained in:
Lubomír Sedlář 2018-04-12 13:42:35 +02:00
parent 6c327d6971
commit 1a0e311a4d
10 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
From 3f60e62ea86a3180b45290102d3519347cf8788a 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/8] Revert "Move ostree phase and pipelines for running
Subject: [PATCH 1/9] Revert "Move ostree phase and pipelines for running
phases"
This reverts commit 660c04368ba1abed310f121d01f0fa029eea5f11.

2
0002-Revert-Other-repo-for-OstreeInstaller.patch
View File

@ -1,7 +1,7 @@
From fcc431622fc0305248bb966271c71c8d17fd5f69 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/8] Revert "Other repo for OstreeInstaller"
Subject: [PATCH 2/9] Revert "Other repo for OstreeInstaller"
This reverts commit 5c081cb545715c2a912ff50fa57554e89d905868.
---

2
0003-Revert-Ostree-can-use-pkgset-repos.patch
View File

@ -1,7 +1,7 @@
From 8a7bf97434cbbf2397d3209498eacc326fc130f2 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/8] Revert "Ostree can use pkgset repos"
Subject: [PATCH 3/9] Revert "Ostree can use pkgset repos"
This reverts commit c7cc200246300c6a3946b2e3a9f5f7693896a7d6.
---

2
0004-Include-module-defaults-in-the-repodata.patch
View File

@ -1,7 +1,7 @@
From 7d3baa8531e11059866412ddc6ae1aae4e855fc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C5=A0abata?= <contyk@redhat.com>
Date: Wed, 4 Apr 2018 12:59:52 +0200
Subject: [PATCH 4/8] Include module defaults in the repodata
Subject: [PATCH 4/9] Include module defaults in the repodata
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

2
0005-Handle-relative-paths-in-module_defaults_dir.patch
View File

@ -1,7 +1,7 @@
From 91a03c693222a41a23d1a3250984e0d8c9372b75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C5=A0abata?= <contyk@redhat.com>
Date: Wed, 4 Apr 2018 14:01:10 +0200
Subject: [PATCH 5/8] Handle relative paths in module_defaults_dir
Subject: [PATCH 5/9] Handle relative paths in module_defaults_dir
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

2
0006-Update-configuration-docs-with-module_defaults_dir.patch
View File

@ -1,7 +1,7 @@
From 587b4847843af878650d56e7c093cbef6b356801 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C5=A0abata?= <contyk@redhat.com>
Date: Wed, 4 Apr 2018 14:02:15 +0200
Subject: [PATCH 6/8] Update configuration docs with module_defaults_dir
Subject: [PATCH 6/9] Update configuration docs with module_defaults_dir
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

2
0007-Update-the-configuration-JSON-schema-for-module_defa.patch
View File

@ -1,7 +1,7 @@
From dc6fccd522efc0ae0c2072812b6fc0559cc74475 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C5=A0abata?= <contyk@redhat.com>
Date: Wed, 11 Apr 2018 10:33:42 +0200
Subject: [PATCH 7/8] Update the configuration JSON schema for
Subject: [PATCH 7/9] Update the configuration JSON schema for
module_defaults_dir
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8

2
0008-Clone-module-defaults-into-work-directory.patch
View File

@ -1,7 +1,7 @@
From 9104444a7bc874c18de2a57851356e60a776341c 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 16:05:08 +0200
Subject: [PATCH 8/8] Clone module defaults into work/ directory
Subject: [PATCH 8/9] Clone module defaults into work/ directory
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

27
0009-init-Stop-creating-module-defaults-dir-twice.patch Normal file
View File

@ -0,0 +1,27 @@
From 57342f31e94118b172366b7a00b6b5fcfd62c28a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
Date: Thu, 12 Apr 2018 13:37:30 +0200
Subject: [PATCH 9/9] init: Stop creating module defaults dir twice
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
JIRA: COMPOSE-2447
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
---
pungi/phases/init.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pungi/phases/init.py b/pungi/phases/init.py
index 9d9212e7..d6afcd92 100644
--- a/pungi/phases/init.py
+++ b/pungi/phases/init.py
@@ -178,4 +178,4 @@ def write_module_defaults(compose):
with temp_dir(prefix="moduledefaults_") as tmp_dir:
get_dir_from_scm(scm_dict, tmp_dir, logger=compose._logger)
compose.log_debug("Writing module defaults")
- shutil.copytree(tmp_dir, compose.paths.work.module_defaults_dir())
+ shutil.copytree(tmp_dir, compose.paths.work.module_defaults_dir(create_dir=False))
--
2.13.6

6
pungi.spec
View File

@ -1,6 +1,6 @@
Name: pungi
Version: 4.1.23
Release: 3%{?dist}
Release: 4%{?dist}
Summary: Distribution compose tool
Group: Development/Tools
@ -16,6 +16,7 @@ Patch5: 0005-Handle-relative-paths-in-module_defaults_dir.patch
Patch6: 0006-Update-configuration-docs-with-module_defaults_dir.patch
Patch7: 0007-Update-the-configuration-JSON-schema-for-module_defa.patch
Patch8: 0008-Clone-module-defaults-into-work-directory.patch
Patch9: 0009-init-Stop-creating-module-defaults-dir-twice.patch
BuildRequires: python3-nose
BuildRequires: python3-mock
@ -182,6 +183,9 @@ nosetests-3 --exe
%{_bindir}/%{name}-wait-for-signed-ostree-handler
%changelog
* Thu Apr 12 2018 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.23-4
- Stop creating module defaults dir twice
* Thu Apr 12 2018 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.23-3
- Add support for module defaults