This commit is contained in:
Lubomír Sedlář 2019-10-17 11:36:35 +02:00
parent 8f6800baf9
commit f2459fd7a1
2 changed files with 33 additions and 1 deletions

28
1281.patch Normal file
View File

@ -0,0 +1,28 @@
From 8bbf9ac13e8e54ec6f51828436744448058db2db Mon Sep 17 00:00:00 2001
From: Lubomír Sedlář <lsedlar@redhat.com>
Date: Oct 17 2019 07:17:36 +0000
Subject: pkgset: Only reuse valid old repo
Instead of just checking that the repo directory exists, make sure the
repodata subdirectory is in there. If it's missing, then createrepo_c
has nothing to use anyway, and it may help avoid issues.
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
---
diff --git a/pungi/phases/pkgset/common.py b/pungi/phases/pkgset/common.py
index 6e53cfc..135c7f8 100644
--- a/pungi/phases/pkgset/common.py
+++ b/pungi/phases/pkgset/common.py
@@ -77,7 +77,7 @@ def get_create_global_repo_cmd(compose, path_prefix, repo_dir_global, pkgset):
repo_dir, os.path.abspath(compose.topdir).rstrip("/") + "/"
)
old_repo_dir = os.path.join(old_compose_path, rel_path)
- if os.path.isdir(old_repo_dir):
+ if os.path.isdir(os.path.join(old_repo_dir, "repodata")):
compose.log_info("Using old repodata from: %s", old_repo_dir)
update_md_path = old_repo_dir

View File

@ -2,7 +2,7 @@
Name: pungi Name: pungi
Version: 4.1.39 Version: 4.1.39
Release: 4%{?dist} Release: 5%{?dist}
Summary: Distribution compose tool Summary: Distribution compose tool
License: GPLv2 License: GPLv2
@ -10,6 +10,7 @@ URL: https://pagure.io/pungi
Source0: https://pagure.io/releases/%{name}/%{name}-%{version}.tar.bz2 Source0: https://pagure.io/releases/%{name}/%{name}-%{version}.tar.bz2
Patch0: 0001-Allow-loading-overrides-for-module-defaults.patch Patch0: 0001-Allow-loading-overrides-for-module-defaults.patch
Patch1: https://pagure.io/pungi/pull-request/1278.patch Patch1: https://pagure.io/pungi/pull-request/1278.patch
Patch2: https://pagure.io/pungi/pull-request/1281.patch
BuildRequires: python3-nose BuildRequires: python3-nose
BuildRequires: python3-mock BuildRequires: python3-mock
@ -144,6 +145,9 @@ nosetests-3 --exe
%{_bindir}/%{name}-wait-for-signed-ostree-handler %{_bindir}/%{name}-wait-for-signed-ostree-handler
%changelog %changelog
* Thu Oct 17 2019 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.39-5
- Add https://pagure.io/pungi/pull-request/1281
* Tue Oct 15 2019 Kevin Fenzi <kevin@scrye.com> - 4.1.39-4 * Tue Oct 15 2019 Kevin Fenzi <kevin@scrye.com> - 4.1.39-4
- Add https://pagure.io/pungi/pull-request/1278 - Add https://pagure.io/pungi/pull-request/1278