.gitignore

@@ -1 +1 @@
-SOURCES/pungi-4.3.8.tar.bz2
+SOURCES/pungi-4.1.38.tar.bz2

.pungi.metadata

@@ -1 +1 @@
-426d78b1eea28f716e7f403aed3b64a0b8e00711  SOURCES/pungi-4.3.8.tar.bz2
+9fe83327acf4c7233db6dcd6d108ff466ca924b1  SOURCES/pungi-4.1.38.tar.bz2

SOURCES/0001-Add-charset-detection-to-tweak_configs.patch

@@ -1,40 +1,38 @@
-From df408e43ace861fdc2c016aca002bc2e23232837 Mon Sep 17 00:00:00 2001
+From a90340decd367296c58d7339ab235f2955e5f5cb Mon Sep 17 00:00:00 2001
-From: Eugene Zamriy <evgeniy.zamriy@softline.com>
+From: tigro <tigro@msvsphere-os.ru>
-Date: Thu, 27 Jul 2023 23:48:40 +0300
+Date: Tue, 23 Jan 2024 12:53:16 +0300
 Subject: [PATCH] Add charset detection to tweak_configs
 
-This patch is required for making Pungi work with isolinux.cfg
-files in cp866 encoding.
 ---
  pungi/phases/buildinstall.py | 11 +++++++----
  1 file changed, 7 insertions(+), 4 deletions(-)
 
 diff --git a/pungi/phases/buildinstall.py b/pungi/phases/buildinstall.py
-index 354c47a..a6efc59 100644
+index e8feea0..706e960 100644
 --- a/pungi/phases/buildinstall.py
 +++ b/pungi/phases/buildinstall.py
-@@ -22,6 +22,7 @@ import re
+@@ -19,6 +19,7 @@ import os
- from six.moves import cPickle as pickle
+ import time
- from copy import copy
+ import shutil
- 
+ import re
 +import chardet
+ 
  from kobo.threads import ThreadPool, WorkerThread
- from kobo.shortcuts import run, force_list
+ from kobo.shortcuts import run
- import kobo.rpmlib
+@@ -247,8 +248,10 @@ def tweak_configs(path, volid, ks_file, configs=BOOT_CONFIGS):
-@@ -383,8 +384,10 @@ def tweak_configs(path, volid, ks_file, configs=BOOT_CONFIGS, logger=None):
-         if not os.path.exists(config_path):
              continue
+         found_configs.append(config)
  
 -        with open(config_path, "r") as f:
--            data = original_data = f.read()
+-            data = f.read()
 +        with open(config_path, "rb") as f:
 +            byte_data = f.read()
 +            encoding = chardet.detect(byte_data)["encoding"]
-+            data = original_data = byte_data.decode(encoding)
++            data = byte_data.decode(encoding)
          os.unlink(config_path)  # break hadlink by removing file writing a new one
  
          # double-escape volid in yaboot.conf
-@@ -398,8 +401,8 @@ def tweak_configs(path, volid, ks_file, configs=BOOT_CONFIGS, logger=None):
+@@ -262,8 +265,8 @@ def tweak_configs(path, volid, ks_file, configs=BOOT_CONFIGS):
          data = re.sub(r":LABEL=[^ \n]*", r":LABEL=%s%s" % (new_volid, ks), data)
          data = re.sub(r"(search .* -l) '[^'\n]*'", r"\1 '%s'" % volid, data)
  
@@ -43,8 +41,8 @@ index 354c47a..a6efc59 100644
 +        with open(config_path, "wb") as f:
 +            f.write(data.encode(encoding))
  
-         if data != original_data:
+     return found_configs
-             found_configs.append(config)
+ 
 -- 
-2.41.0
+2.43.0
 

SPECS/pungi.spec

@@ -1,23 +1,23 @@
 %{?python_enable_dependency_generator}
 
 Name:           pungi
-Version:        4.3.8
+Version:        4.1.38
-Release:        1%{?dist}.inferit
+Release:        1%{?dist}.2.inferit
 Summary:        Distribution compose tool
 
-License:        GPL-2.0-only
+License:        GPLv2
 URL:            https://pagure.io/pungi
 Source0:        https://pagure.io/releases/%{name}/%{name}-%{version}.tar.bz2
+Patch0:         0001-Add-charset-detection-to-tweak_configs.patch
 
-# MSVSphere patches
+BuildRequires:  python3-nose
-Patch1001:      0001-Add-charset-detection-to-tweak_configs.patch
-
-BuildRequires:  make
-BuildRequires:  python3-pytest
 BuildRequires:  python3-mock
+%if 0%{?fedora} < 31
+BuildRequires:  python2-devel
+%endif
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
-BuildRequires:  python3-productmd >= 1.28
+BuildRequires:  python3-productmd >= 1.11
 BuildRequires:  python3-kobo-rpmlib
 BuildRequires:  createrepo_c
 BuildRequires:  python3-lxml
@@ -31,16 +31,26 @@ BuildRequires:  python3-jsonschema
 BuildRequires:  python3-libcomps
 BuildRequires:  python3-kobo
 BuildRequires:  python3-koji
+BuildRequires:  python3-unittest2
 BuildRequires:  lorax
 BuildRequires:  python3-PyYAML
-BuildRequires:  python3-libmodulemd >= 2.8.0
+BuildRequires:  libmodulemd < 2
+BuildRequires:  python3-gobject-base
 BuildRequires:  python3-gobject
 BuildRequires:  python3-createrepo_c
 BuildRequires:  python3-dogpile-cache
 BuildRequires:  python3-parameterized
 
 #deps for doc building
-BuildRequires:  python3-sphinx
+BuildRequires:  python3-sphinx, texlive-collection-fontsrecommended
+BuildRequires:  texlive-cmap, texlive-babel-english, texlive-fancyhdr
+BuildRequires:  texlive-titlesec, texlive-framed, texlive-threeparttable
+BuildRequires:  texlive-mdwtools, texlive-wrapfig, texlive-parskip, texlive-upquote
+BuildRequires:  texlive-multirow, texlive-capt-of, texlive-eqparbox
+BuildRequires:  tex(fncychap.sty)
+BuildRequires:  tex(tabulary.sty)
+BuildRequires:  tex(needspace.sty)
+BuildRequires:  latexmk
 
 Requires:       python3-kobo-rpmlib
 Requires:       python3-kickstart
@@ -50,21 +60,16 @@ Requires:       python3-koji-cli-plugins
 Requires:       isomd5sum
 Requires:       genisoimage
 Requires:       git
+Requires:       libguestfs-tools-c
 Requires:       python3-dnf
 Requires:       python3-multilib
 Requires:       python3-libcomps
 Requires:       python3-koji
-Requires:       python3-libmodulemd >= 2.8.0
+Requires:       libmodulemd < 2
+Requires:       python3-gobject-base
 Requires:       python3-gobject
 Requires:       python3-createrepo_c
 Requires:       python3-PyYAML
-Requires:       python3-productmd >= 1.28
-# MSVSphere changes
-Requires:       python3-chardet
-
-# This package is not available on i686, hence we cannot require it
-# See https://bugzilla.redhat.com/show_bug.cgi?id=1743421
-Recommends:     libguestfs-tools-c
 
 Requires:       python3-%{name} = %{version}-%{release}
 
@@ -83,6 +88,39 @@ These utilities work with finished composes produced by Pungi. They can be used
 for creating unified ISO images, validating config file or sending progress
 notification to Fedora Message Bus.
 
+
+%if 0%{?fedora} < 31
+%package legacy
+Summary:    Legacy pungi executable
+Requires:   %{name} = %{version}-%{release}
+Requires:   python2-%{name} = %{version}-%{release}
+Requires:   createrepo
+Requires:   isomd5sum
+Requires:   lorax
+Requires:   python2-functools32
+Requires:   python2-kickstart
+Requires:   python2-kobo
+Requires:   python2-libselinux
+Requires:   python2-lockfile
+Requires:   python2-productmd >= 1.17
+Requires:   python2-six
+Requires:   repoview
+Requires:   xorriso
+Requires:   yum
+Requires:   yum-utils
+
+%description legacy
+Legacy pungi executable. This package depends on Python 2.
+
+
+%package -n python2-%{name}
+Summary:    Python 2 libraries for pungi
+
+%description -n python2-%{name}
+Python library with code for Pungi. This is not a public library and there are
+no guarantees about API stability.
+%endif
+
 %package -n python3-%{name}
 Summary:    Python 3 libraries for pungi
 
@@ -95,28 +133,44 @@ no guarantees about API stability.
 %autosetup -p1
 
 %build
+%if 0%{?fedora} < 31
+%py2_build
+%endif
 %py3_build
 cd doc
+make latexpdf SPHINXBUILD=/usr/bin/sphinx-build-3
 make epub     SPHINXBUILD=/usr/bin/sphinx-build-3
 make text     SPHINXBUILD=/usr/bin/sphinx-build-3
 make man      SPHINXBUILD=/usr/bin/sphinx-build-3
 gzip _build/man/pungi.1
 
 %install
+%if 0%{?fedora} < 31
+%py2_install
+mv %{buildroot}%{_bindir}/pungi %{buildroot}%{_bindir}/pungi-2
+%endif
 %py3_install
-%{__install} -d %{buildroot}/var/cache/pungi/createrepo_c
+%if 0%{?fedora} < 31
+mv %{buildroot}%{_bindir}/pungi-2 %{buildroot}%{_bindir}/pungi
+%endif
+%{__install} -d %{buildroot}/var/cache/pungi
 %{__install} -d %{buildroot}%{_mandir}/man1
 %{__install} -m 0644 doc/_build/man/pungi.1.gz %{buildroot}%{_mandir}/man1
 
+# No utils package for Python 2. On Py 3 this is not installed at all
+rm -rf %{buildroot}%{python2_sitelib}/%{name}_utils
+
+    %if 0%{?fedora} > 30
 rm %{buildroot}%{_bindir}/pungi
+%endif
 
 %check
-%pytest
+nosetests-3 --exe
 
 %files
 %license COPYING GPL
 %doc AUTHORS
-%doc doc/_build/epub/Pungi.epub doc/_build/text/*
+%doc doc/_build/latex/Pungi.pdf doc/_build/epub/Pungi.epub doc/_build/text/*
 %{_bindir}/%{name}-koji
 %{_bindir}/%{name}-gather
 %{_bindir}/comps_filter
@@ -124,11 +178,19 @@ rm %{buildroot}%{_bindir}/pungi
 %{_mandir}/man1/pungi.1.gz
 %{_datadir}/pungi
 /var/cache/pungi
-%dir %attr(1777, root, root) /var/cache/pungi/createrepo_c
+
+%if 0%{?fedora} < 31
+%files legacy
+%{_bindir}/%{name}
+
+%files -n python2-%{name}
+%{python2_sitelib}/%{name}
+%{python2_sitelib}/%{name}-%{version}-py?.?.egg-info
+%endif
 
 %files -n python3-%{name}
 %{python3_sitelib}/%{name}
-%{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info
+%{python3_sitelib}/%{name}-%{version}-py?.?.egg-info
 
 %files utils
 %{python3_sitelib}/%{name}_utils
@@ -143,472 +205,14 @@ rm %{buildroot}%{_bindir}/pungi
 %{_bindir}/%{name}-wait-for-signed-ostree-handler
 
 %changelog
-* Thu Jul 27 2023 Eugene Zamriy <ezamriy@msvsphere.ru> - 4.3.8-1.inferit
+* Tue Jan 23 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 4.1.38-1.2.inferit
-- buildinstall: Added bootloader configs charset detection patch
+- Add charset detection to tweak_configs
-- Added python3-chardet requirement
+
-
+* Thu Jul 25 2019 Stephen Smoogen <smooge@fedoraproject.org> - 4.1.38-1.2
-* Thu Mar 30 2023 Haibo Lin <hlin@redhat.com> - 4.3.8-1
+- Find that I needed to change a libmodulemd elsewhere after it built
-- createiso: Update possibly changed file on DVD (lsedlar)
+
-- pkgset: Stop reuse if configuration changed (lsedlar)
+* Thu Jul 25 2019 Stephen Smoogen <smooge@fedoraproject.org> - 4.1.38-1.1
-- Allow disabling inheriting ExcludeArch to noarch packages (lsedlar)
+- Caveman hack config to make this compile enough for bodhi. Turn libmodulemd to lowest version and tell productmd to be old version.
-- pkgset: Support extra builds with no tags (lsedlar)
-- buildinstall: Avoid pointlessly tweaking the boot images (lsedlar)
-- Prevent to reuse if unsigned packages are allowed (hlin)
-- Pass parent id/respin id to CTS (lsedlar)
-- Exclude existing files in boot.iso (hlin)
-- image-build/osbuild: Pull ISOs into the compose (lsedlar)
-- Retry 401 error from CTS (lsedlar)
-- gather: Better detection of debuginfo in lookaside (lsedlar)
-- Log versions of all installed packages (hlin)
-- Use authentication for all CTS calls (lsedlar)
-- Fix black complaints (lsedlar)
-- Add vhd.gz extension to compressed VHD images (lsedlar)
-- Add vhd-compressed image type (lsedlar)
-- Update to work with latest mock (lsedlar)
-- Default bztar format for sdist command (onosek)
-
-* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.7-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Fri Dec 09 2022 Ondřej Nosek <onosek@redhat.com> - 4.3.7-1
-- osbuild: test passing of rich repos from configuration (lsedlar)
-- osbuild: support specifying `package_sets` for repos (thozza)
-- osbuild: don't use `util.get_repo_urls()` (thozza)
-- osbuild: update schema and config documentation (thozza)
-- Speed up tests by 30 seconds (lsedlar)
-- Stop sending compose paths to CTS (lsedlar)
-- Report errors from CTS (lsedlar)
-- createiso: Create Joliet tree with xorriso (lsedlar)
-- init: Filter comps for modular variants with tags (lsedlar)
-- Retry failed cts requests (hlin)
-- Ignore existing kerberos ticket for CTS auth (lsedlar)
-- osbuild: support specifying upload_options (thozza)
-- osbuild: accept only a single image type in the configuration (thozza)
-- Add Jenkinsfile for CI (hlin)
-- profiler: Flush stdout before printing (lsedlar)
-
-* Mon Nov 07 2022 Lubomír Sedlář <lsedlar@redhat.com> - 4.3.6-2
-- Stop including comps in modular repos
-
-* Fri Aug 26 2022 Lubomír Sedlář <lsedlar@redhat.com> - 4.3.6-1
-- pkgset: Report better error when module is missing an arch (lsedlar)
-- osbuild: add support for building ostree artifacts (ondrej)
-- ostree: Add unified core mode for compose in rpm-ostree (tim)
-- createiso: Make ISO level more granular (lsedlar)
-- Create DVDs with xorriso (lsedlar)
-- Fix compatibility with jsonschema >= 4.0.0 (lsedlar)
-- Fix black complaint (lsedlar)
-- doc: fix osbuild's image_types field name (ondrej)
-- Convert _ssh_run output to str for python3 (hlin)
-- Print more logs for git_ls_remote (hlin)
-- Log time taken of each phase (hlin)
-- Avoid crash when loading pickle file failed (hlin)
-- extra_isos: Fix detection of changed packages (lsedlar)
-
-* Thu Aug 11 2022 Lubomír Sedlář <lsedlar@redhat.com> - 4.3.5-8
-- Backport jsonschema compatibility patch (rhbz#2113607)
-
-* Mon Jul 25 2022 Lubomír Sedlář <lsedlar@redhat.com> - 4.3.5-7
-- Update xorriso patch
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.5-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon Jun 20 2022 Python Maint <python-maint@redhat.com> - 4.3.5-5
-- Rebuilt for Python 3.11
-
-* Thu Jun 16 2022 Adam Williamson <awilliam@redhat.com> - 4.3.5-4
-- Don't try and run isohybrid when using xorriso
-
-* Wed Jun 15 2022 Python Maint <python-maint@redhat.com> - 4.3.5-3
-- Rebuilt for Python 3.11
-
-* Wed Jun 15 2022 Lubomír Sedlář <lsedlar@redhat.com> - 4.3.5-2
-- Backport patch for building DVDs with xorriso command again
-
-* Wed Jun 15 2022 Lubomír Sedlář <lsedlar@redhat.com> - 4.3.5-1
-- Fix module defaults and obsoletes validation (mkulik)
-- Update the cts_keytab field in order to get the hostname of the server
-  (ounsal)
-- Add skip_branding to ostree_installer. (lzhuang)
-- kojiwrapper: Ignore warnings before task id (lsedlar)
-- Restrict jsonschema version (lsedlar)
-- Revert "Do not clone the same repository multiple times, re-use already
-  cloned repository" (hlin)
-- Involve bandit (hlin)
-
-* Wed Jun 08 2022 Lubomír Sedlář <lsedlar@redhat.com> - 4.3.4-2
-- Backport patch for building DVDs with xorriso command
-
-* Mon Apr 04 2022 Ondřej Nosek <onosek@redhat.com> - 4.3.4-1
-- kojiwrapper: Add retries to login call (lsedlar)
-- Variants file in config can contain path (onosek)
-- nomacboot option for livemedia koji tasks (cobrien)
-- doc: improve osbs_registries explanation (kdreyer)
-- osbs: only handle archives of type "image" (kdreyer)
-- Update the default greedy_method value in doc (ounsal)
-- Fix the wrong working directory for the progress_notification script (ounsal)
-- Filter out environment groups unmatch given arch (hlin)
-- profiler: Respect provided output stream (lsedlar)
-- modules: Correct a typo in loading obsoletes (ppisar)
-- Do not clone the same repository multiple times, re-use already cloned
-  repository (ounsal)
-
-* Fri Feb 04 2022 Lubomír Sedlář <lsedlar@redhat.com> - 4.3.3-3
-- Backport typo fix
-
-* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jan 14 2022 Haibo Lin <hlin@redhat.com> - 4.3.3-1
-- hybrid: Explicitly pull in debugsource packages (lsedlar)
-- Add module obsoletes feature (fvalder)
-- buildinstall: Add ability to install extra packages in runroot (ounsal)
-- Ignore osbs/osbuild config when reusing iso images (hlin)
-- compose: Make sure temporary dirs are world readable (lsedlar)
-- Pass compose parameter for debugging git issue (hlin)
-- Generate images.json for extra_isos phase (hlin)
-- Fix tests for python 2.6 (hlin)
-
-* Mon Nov 15 2021 Haibo Lin <hlin@redhat.com> - 4.3.2-2
-- Backport patch for generating images.json
-
-* Thu Nov 11 2021 Haibo Lin <hlin@redhat.com> - 4.3.2-1
-- gather: Load JSON mapping relative to config dir (lsedlar)
-- gather: Stop requiring all variants/arches in JSON (lsedlar)
-- doc: make dnf "backend" settings easier to discover (kdreyer)
-- Remove with_jigdo argument (lsedlar)
-- Check dependencies after config validation (lsedlar)
-- default "with_jigdo" to False (kdreyer)
-- Stop trying to validate non-existent metadata (lsedlar)
-- test images for metadata deserialization error (fdipretre)
-- repoclosure: Use --forcearch for dnf repoclosure (lsedlar)
-- extra_isos: Allow reusing old images (lsedlar)
-- createiso: Allow reusing old images (lsedlar)
-- Remove default runroot channel (lsedlar)
-
-* Tue Oct 26 2021 Lubomír Sedlář <lsedlar@redhat.com> - 4.3.1-1
-- Correct irc network name & add matrix room (dan.cermak)
-- Add missing mock to osbs tests (lsedlar)
-- osbs: Reuse images from old compose (hlin)
-- image_build: Allow reusing old image_build results (hlin)
-- Allow ISO-Level configuration within the config file (ounsal)
-- Work around ODCS creating COMPOSE_ID later (lsedlar)
-- When `cts_url` is configured, use CTS `/repo` API for buildContainer
-  yum_repourls. (jkaluza)
-- Add COMPOSE_ID into the pungi log file (ounsal)
-- buildinstall: Add easy way to check if previous result was reused (lsedlar)
-
-* Mon Oct 04 2021 Lubomír Sedlář <lsedlar@redhat.com> - 4.3.0-2
-- Backport patch to avoid crash on missing COMPOSE_ID
-
-* Wed Sep 15 2021 Lubomír Sedlář <lsedlar@redhat.com> - 4.3.0-1
-- Only build CTS url when configured (lsedlar)
-- Require requests_kerberos only when needed (lsedlar)
-- Allow specifying $COMPOSE_ID in the `repo` value for osbs phase. (jkaluza)
-- Make getting old compose config reusable (lsedlar)
-- paths: Allow customizing log file extension (lsedlar)
-- Add authentication for updating the compose URL in CTS. (ounsal)
-- Fix type detection for osbuild images (lsedlar)
-- Enable pungi to send compose_url patches to CTS (ounsal)
-- Use xorriso instead of isoinfo when createiso_use_xorrisofs is enabled
-  (ounsal)
-- Fix tests for createrepo (drumian)
-- Formatted files according to flake8 and black feedback (drumian)
-- Handle the pungi failures to ensure creation of log files (ounsal)
-- Add createrepo_enable_cache to configuration doc (hlin)
-- Fix formatting (hlin)
-- Install missing deps in ci image (hlin)
-- Use pytest directly incl. support for posargs, e.g.: tox -- -s -vvv
-  tests/path/to/a/single/test_something.py (fvalder)
-- Supersede ModuleStream loading with ModuleIndex (fvalder)
-- Better error message than 'KeyError' in pungi (drumian)
-- Adding multithreading support for pungi/phases/image_checksum.py (jkunstle)
-- doc: more additional_packages documentation (kdreyer)
-- doc: fix typo in additional_packages description (kdreyer)
-- doc: improve signed packages retry docs (kdreyer)
-- Better error message than 'KeyError' in pungi (drumian)
-- doc: explain buildContainer API (kdreyer)
-
-* Wed Aug 04 2021 Haibo Lin <hlin@redhat.com> - 4.2.10-1
-- Show and log command when using the run_blocking_cmd() method (fdipretre)
-- Use cachedir when createrepo (hlin)
-- gather: Add all srpms to variant lookaside repo (lsedlar)
-- Add task URL to watch task log (hlin)
-- Log warning when module defined in variants.xml not found (hlin)
-- pkgset: Compare future events correctly (lsedlar)
-- util: Strip file:// from local urls (lsedlar)
-- Clean up temporary yumroot dir (hlin)
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.9-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 4.2.9-2
-- Rebuilt for Python 3.10
-
-* Thu Apr 29 2021 onosek - 4.2.9-1
-- New upstream release 4.2.9
-- Fix can't link XDEV using repos as pkgset_sources (romain.forlot)
-- Updated the deprecated ks argument name (to the current inst.ks) (lveyde)
-- gather: Adjust reusing with lookaside (hlin)
-- hybrid: Optimize getting lookaside packages (lsedlar)
-- gather: Copy old logs when reusing gather result (hlin)
-- Cancel koji tasks when pungi terminated (hlin)
-- Add Dockerfile for building testing image (hlin)
-- image_container: Fix incorrect arch processing (lsedlar)
-- runroot: Adjust permissions always (hlin)
-- Format code (hlin)
-- pkgset: Fix meaning of retries (lsedlar)
-- pkgset: Store module tag only if module is used (lsedlar)
-- Store extended traceback for gather errors (lsedlar)
-
-* Fri Feb 12 2021 Ondrej Nosek <onosek@redhat.com> - 4.2.8-1
-- New upstream version
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.7-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Fri Jan 22 2021 Lubomír Sedlář <lsedlar@redhat.com> - 4.2.7-2
-- Backport patch for preserving default attribute in comps
-
-* Tue Dec  8 09:01:52 CET 2020 Lubomír Sedlář <lsedlar@redhat.com> - 4.2.7-1
-- New upstream version
-
-* Thu Nov 05 2020 Lubomír Sedlář <lsedlar@redhat.com> - 4.2.6-1
-- New upstream release
-
-* Fri Sep 25 2020 Lubomír Sedlář <lsedlar@redhat.com> - 4.2.5-1
-- New upstream release
-
-* Tue Aug 18 2020 Lubomír Sedlář <lsedlar@redhat.com> - 4.2.4-1
-- New upstream version
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu Jun 11 2020 Lubomír Sedlář <lsedlar@redhat.com> - 4.2.3-2
-- Stop building PDF documentation
-
-* Thu Jun 11 2020 Lubomír Sedlář <lsedlar@redhat.com> - 4.2.3-1
-- Move test for unsigned packages with pkgset_koji_scratch_tasks to PkgsetPhase
-  class. (jkaluza)
-- Allow building compose with scratch builds defined by
-  `pkgset_koji_scratch_tasks`. (jkaluza)
-- createrepo: Allow making productid glob stricter (lsedlar)
-- docs: Remove outdated note (lsedlar)
-- createrepo: Add extra modulemd files to the repo (lsedlar)
-- pkgset: handle exception when using dogpile cache (hlin)
-- notification: Add compose_path into the messages (hlin)
-- gather: handle mirrorlist in kickstart (frederic.pierret)
-- Allow only creating unified ISO for specified arch (hlin)
-- docs: update doc for gather_lookaside_repos option (hlin)
-- Include the output of getisoimage in the error message (hlin)
-- tests: Patch time in CTS related tests (lsedlar)
-- Allow using Pungi Koji plugin for ostree phases. (jkaluza)
-- Allow getting the compose id from CTS (Compose Tracking Service). (jkaluza)
-- Fix flake8 issues (lsedlar)
-- Optimize the _link_file function to not call os.stat redundantly. This will
-  eliminate 2 calls to os.stat per one invocation of the _link_file function.
-  Assuming during the compose build 50000 files are linked, this change will
-  eliminate 100000 redundant calls to os.stat. (bkhomuts)
-- doc: explain sigkey behavior (kdreyer)
-- doc: explain tradeoffs with pkgset_allow_reuse (kdreyer)
-- doc: fix grammar for pkgset_allow_reuse setting (kdreyer)
-- Support --skip-branding option in lorax (hlin)
-- docs: Embed phases.svg directly (hlin)
-- Execute image_checksum phase right after the dependent phases (hlin)
-
-* Mon May 25 2020 Miro Hrončok <mhroncok@redhat.com> - 4.2.2-3
-- Rebuilt for Python 3.9
-
-* Thu May 21 2020 Miro Hrončok <mhroncok@redhat.com> - 4.2.2-2
-- Only recommend libguestfs-tools-c because it's not available on i686 (#1743421)
-
-* Thu Apr 30 2020 Lubomír Sedlář <lsedlar@redhat.com> - 4.2.2-1
-- New upstream release
-
-* Mon Mar 16 2020 Lubomír Sedlář <lsedlar@redhat.com> - 4.2.1-2
-- Fix false positive debuginfo detection
-
-* Fri Mar 13 2020 Lubomír Sedlář <lsedlar@redhat.com> - 4.2.1-1
-- New upstream release
-
-* Mon Feb 03 2020 Lubomír Sedlář <lsedlar@redhat.com> - 4.2.0-1
-- iso: Clean up cache for guestmount (lsedlar)
-- Remove deprecated warn() call (lsedlar)
-- arch_utils: Fix ResourceWarnings (lsedlar)
-- Add support for new Pungi Buildinstall Koji plugin. (jkaluza)
-- Make --task-id mandatory in get_runroot_cmd (hlin)
-- Wait on runroot tasks with wait-task command (hlin)
-- pkgset: Ignore deleted module builds (hlin)
-- Add tests for new exclude options (lsedlar)
-- Remove invalid parameters from osbs config (hlin)
-- pungi-gather: add options for excluding debug and source packages
-  (frederic.pierret)
-- Hide latest koji package via pkgset_koji_builds option (hlin)
-- Add a new option for customizing version in .treeinfo (lsedlar)
-- Kickstart on RHEL 7 does not have metalink attr (lsedlar)
-- Support generating ISOs when using link_type="symlink". (jkaluza)
-- pkgset: Hardlink downloaded packages (lsedlar)
-- Check dependency of --just-phase (hlin)
-- Update runroot_method documentation. (jkaluza)
-- Remove productimg phase (hlin)
-- Fix unified isos with missing images.json (lsedlar)
-- Allow setting runroot_method per Pungi phase. (jkaluza)
-- ostree: Fix arg passed to scm.get_dir_from_scm (hlin)
-- Improve detection of lookaside packages (lsedlar)
-- gather: Deduplicate packages before printing (lsedlar)
-- Do not mention pdc_client when missing modulemd (hlin)
-- gather: Improve logging for gathering (hlin)
-- gather: handle metalink in kickstart repos (frederic.pierret)
-- tests: drop sys.path modification (hlin)
-- cleanup: refactor scripts via entry points (hlin)
-- Avoid crash if a module is not available on all arches (lsedlar)
-- Add version constraint to productmd dependency (lsedlar)
-- Allow specifying temp dir in pungi-gather (frederic.pierret)
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.41-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Jan 15 2020 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.41-4
-- Fix bad argument to logger in ostree phase
-
-* Fri Dec 06 2019 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.41-3
-- Add version constraint for productmd
-
-* Thu Dec 05 2019 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.41-2
-- Avoid crash when module has limited arches
-
-* Mon Dec 02 2019 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.41-1
-- repoclosure: Parse all fus logs (lsedlar)
-- runroot: Log different commands to different files (lsedlar)
-- buildinstall: Log message for boot config change (hlin)
-- livemedia: Remove title option (hlin)
-- Make sure repoclosure cache cleaned when running as root (hlin)
-- Prefix lookaside cache dir with compose id (hlin)
-- Prefix repoclosure cache dir with compose id (hlin)
-- hybrid: Download remote files when getting platform (lsedlar)
-- gather: Use fresh cache for each sequence of fus runs (lsedlar)
-- tests: Add test for compose logger setup (hlin)
-- Do not write images.json if all related phases skipped (hlin)
-- gather: Do not write metadata if gather phase skipped (hlin)
-- Write global metadata about extra files (lsedlar)
-- scm: Add backend for downloading archives from Koji (lsedlar)
-- Pass compose to SCM wrappers (lsedlar)
-- Remove misleading warning about size of the ISO (hlin)
-- Retry watching koji tasks on server outage (hlin)
-- config-dump: Allow overwritting config via -e option (hlin)
-
-* Tue Nov 26 2019 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.40-4
-- Propagate errors from depsolving methods
-
-* Mon Nov 11 2019 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.40-3
-- pkgset: Fix running without any koji tags
-
-* Fri Nov 08 2019 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.40-2
-- Get message from LogRecord with a method
-
-* Wed Oct 23 2019 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.40-1
-- pkgset: Only reuse valid old repo (lsedlar)
-- Clean up skipping phases (hlin)
-- Fix crash on unsigned packages (hlin)
-- doc: Make it clear that the field 'repo' has to be empty for 'file' backend
-  (juliana.rodrigueiro)
-- gather: Make depsolving parallel (hlin)
-- doc: Add full examples of compose configuration (lsedlar)
-- ostree-install: allow configuring additional depenencies for runroot
-  (otaylor)
-- buildinstall: Allow customizing dracut arguments (lsedlar)
-- Use custom assertion for checking content of files (lsedlar)
-- Drop custom ANY object (lsedlar)
-- Remove usage of unittest2 on Python 3 (lsedlar)
-- Remove shebangs from test files (lsedlar)
-- gather: Resolve dependencies of debug packages (lsedlar)
-- gather: Fix bare except block (lsedlar)
-- gather: Fix formatting (lsedlar)
-- gather: Simplify adding packages to result (lsedlar)
-- gather: Remove unused import (lsedlar)
-- Regenerate test fixture repo (lsedlar)
-- Move import of modulemd to a separate module (lsedlar)
-- ostree: Run commands in universal_newlines mode (lsedlar)
-- pkgset: Allow filtering modules from Koji tags (lsedlar)
-- pkgset: Initialize path_prefix to empty value (lsedlar)
-- Allow loading overrides for module defaults (lsedlar)
-- Move pkgset skipping logs to separate file (hlin)
-- Fix crash when pkgset phase is skipped (lsedlar)
-- Resolve symlinks to images (lsedlar)
-
-* 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
-- Add https://pagure.io/pungi/pull-request/1278
-
-* Mon Sep 23 2019 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.39-3
-- Backport patch for module defaults overrides
-
-* Mon Sep 09 2019 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.39-2
-- Drop pungi-legacy subpackage due to broken dependencies
-
-* Mon Sep 09 2019 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.39-1
-- Fix getting platforms from lookaside (lsedlar)
-- extra-files: Simplify iterating over variants (lsedlar)
-- createiso: Make media.repo sticky (lsedlar)
-- hybrid: Re-add getting platform from lookaside repos (lsedlar)
-- pkgset: Remove fast_merge method (lsedlar)
-- Add test for materialized pkgset (lsedlar)
-- Remove package whitelist (lsedlar)
-- paths: Remove arch_repo path (lsedlar)
-- gather: Remove use of arch_repo (lsedlar)
-- ostree-installer: Remove usage of arch_repo (lsedlar)
-- ostree: Remove arch_repo path usage (lsedlar)
-- buildinstall: Remove arch_repo usage (lsedlar)
-- createrepo: Remove arch_repo usage (lsedlar)
-- Fix tests (lsedlar)
-- pkgset: Update processing file cache (lsedlar)
-- Remove pickling from source repos (lsedlar)
-- gather: Port hybrid method (lsedlar)
-- pkgset: Update Koji source to create multiple pkgsets (lsedlar)
-- pkgset: Add object representing a package set on disk (lsedlar)
-- pkgset: Add name to package set (lsedlar)
-- paths: Add function to generate path to pkgset repo (lsedlar)
-- Update code to pass around a list of pkgsets (lsedlar)
-- Store the parsed variants for possible later re-use (riehecky)
-- compose: additional logging on variants being processed (riehecky)
-- Refactor code for removing repoclosure cache (hlin)
-- Delete cache dirs even though repoclosure command failed (hlin)
-- Delete lookaside cache dir (hlin)
-- Delete repoclosure cache (hlin)
-- Add function to get all arches in a compose (lsedlar)
-- Remove not-used hack to workaround required option (lsedlar)
-- pkgset: Create repos in a single place (lsedlar)
-- pkgset: Added modules to variant in correct format (lsedlar)
-- Add compose_id to repoclosure/lookaside directory names (hlin)
-- Fix shadowed variable (lsedlar)
-- Remove now unused msg variables (lsedlar)
-- Remove debug mode (lsedlar)
-- Remove dead code (lsedlar)
-- pkgset: Check for empty module index (lsedlar)
-- gather: Mark repos as containing module hotfixes (lsedlar)
-- config: Deprecate bootable option (hlin)
-- Use createrepo_checksum option instead of hardcoded sha256 (hlin)
-- pkgset: Skip adding modulemd if there is none (lsedlar)
-- test: Allow turning strictness off as well (lsedlar)
-- Port to libmodulemd v2 (lsedlar)
-- test: Option to make size check strict (lsedlar)
-- gather: Remove unused argument (lsedlar)
-- pkgset: Load modulemd only when needed (lsedlar)
-- Stop storing modulemd without arch (lsedlar)
-- Remove unused import (lsedlar)
-- doc: Clarify relationship to Koji (lsedlar)
-- gather: Correctly sort list with multiple data types (lsedlar)
-- git-changelog: Fix running on Python 3 (lsedlar)
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 4.1.38-3
-- Rebuilt for Python 3.8
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.38-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
 * Tue Jul 02 2019 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.38-1
 - Remove remaining mentions of runroot option (lsedlar)