diff --git a/.gitignore b/.gitignore index cebe3c3..c9bbb7e 100644 --- a/.gitignore +++ b/.gitignore @@ -343,3 +343,7 @@ /anaconda-38.19.tar.bz2 /anaconda-38.20.tar.bz2 /anaconda-38.21.tar.bz2 +/anaconda-38.23.1.tar.bz2 +/anaconda-38.23.2.tar.bz2 +/anaconda-38.23.3.tar.bz2 +/anaconda-38.23.4.tar.bz2 diff --git a/.packit.yml b/.packit.yml index 1d09827..592ff72 100644 --- a/.packit.yml +++ b/.packit.yml @@ -38,32 +38,24 @@ jobs: - job: propose_downstream trigger: release - dist_git_branches: main + dist_git_branches: f38 - job: tests trigger: pull_request targets: - - fedora-rawhide - - - job: copr_build - trigger: pull_request - targets: - - fedora-rawhide - additional_repos: - # This repository contains fixup of Rawhide broken environment. - # Mainly useful when there is a package which is not yet in Rawhide but build is available. - - "https://fedorapeople.org/groups/anaconda/repos/anaconda_fixup_repo/" + - fedora-38 - job: copr_build trigger: commit targets: - - fedora-rawhide - branch: master + - fedora-38 + branch: fedora-38 owner: "@rhinstaller" - project: Anaconda + project: Anaconda-devel + preserve_project: True additional_repos: + - "copr://@storage/blivet-daily" # This repository contains fixup of Rawhide broken environment. # Mainly useful when there is a package which is not yet in Rawhide but build is available. - "https://fedorapeople.org/groups/anaconda/repos/anaconda_fixup_repo/" - preserve_project: True diff --git a/0001-exception-only-attach-existent-and-non-empty-files-2.patch b/0001-exception-only-attach-existent-and-non-empty-files-2.patch new file mode 100644 index 0000000..a82cf62 --- /dev/null +++ b/0001-exception-only-attach-existent-and-non-empty-files-2.patch @@ -0,0 +1,35 @@ +From 61155974a597e49bbc2b33ba2dc1e3b70162d99e Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Tue, 11 Apr 2023 10:15:16 -0700 +Subject: [PATCH] exception: only attach existent and non-empty files + (#2185827) + +libreport barfs (in a non-fatal but scary way) if a file we try +to attach does not exist or is empty. Let's make sure all the +files exist and aren't empty before we try to attach them. In a +current F38+ live install, for instance, both packaging.log and +dnf.librepo.log are usually empty. + +Signed-off-by: Adam Williamson +--- + pyanaconda/exception.py | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/pyanaconda/exception.py b/pyanaconda/exception.py +index d507cafcc2..3c39dff0f2 100644 +--- a/pyanaconda/exception.py ++++ b/pyanaconda/exception.py +@@ -138,6 +138,10 @@ class AnacondaExceptionHandler(ExceptionHandler): + """ + + log.debug("running handleException") ++ # don't try and attach empty or non-existent files (#2185827) ++ self.conf.fileList = [ ++ fn for fn in self.conf.fileList if os.path.exists(fn) and os.path.getsize(fn) > 0 ++ ] + exception_lines = traceback.format_exception(*dump_info.exc_info) + log.critical("\n".join(exception_lines)) + +-- +2.40.0 + diff --git a/README.packit b/README.packit index be03dc7..10ab7f2 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.66.0.post6+gedfbde6. +The file was generated using packit 0.69.0.post27+g1374cc1. diff --git a/anaconda.spec b/anaconda.spec index 9061104..d46e5a0 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,7 +1,7 @@ Summary: Graphical system installer Name: anaconda -Version: 38.21 -Release: 1%{?dist} +Version: 38.23.4 +Release: 2%{?dist} License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -11,6 +11,10 @@ URL: http://fedoraproject.org/wiki/Anaconda # ./autogen.sh # make dist Source0: https://github.com/rhinstaller/%{name}/releases/download/%{name}-%{version}-1/%{name}-%{version}.tar.bz2 +# https://github.com/rhinstaller/anaconda/pull/4690 +# https://bugzilla.redhat.com/show_bug.cgi?id=2185827 +# Don't try and attach non-existent or empty files to bug reports +Patch0: 0001-exception-only-attach-existent-and-non-empty-files-2.patch # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). @@ -39,13 +43,14 @@ Source0: https://github.com/rhinstaller/%{name}/releases/download/%{name}-%{vers %define libxklavierver 5.4 %define mehver 0.23-1 %define nmver 1.0 -%define pykickstartver 3.43-1 +%define pykickstartver 3.46-1 %define pypartedver 2.5-2 %define pythonblivetver 1:3.6.0-1 %define rpmver 4.15.0 %define simplelinever 1.9.0-1 %define subscriptionmanagerver 1.26 %define utillinuxver 2.15.1 +%define rpmostreever 2023.2 BuildRequires: libtool BuildRequires: gettext-devel >= %{gettextver} @@ -237,6 +242,11 @@ Requires: nm-connection-editor Requires: librsvg2 Requires: gnome-kiosk Requires: brltty +# dependencies for rpm-ostree payload module +Requires: rpm-ostree >= %{rpmostreever} +Requires: ostree +# used by ostree command for native containers +Requires: skopeo %description install-img-deps The anaconda-install-img-deps metapackage lists all boot.iso installation image dependencies. @@ -352,7 +362,7 @@ rm -rf \ %{buildroot}/%{_sbindir}/liveinst \ %{buildroot}/%{_datadir}/anaconda/gnome \ %{buildroot}/%{_datadir}/anaconda/gnome/fedora-welcome \ - %{buildroot}/%{_datadir}/anaconda/gnome/fedora-welcome.desktop \ + %{buildroot}/%{_datadir}/anaconda/gnome/org.fedoraproject.welcome-screen.desktop \ %{buildroot}/%{_datadir}/applications/liveinst.desktop %endif @@ -463,6 +473,63 @@ rm -rf \ %{_prefix}/libexec/anaconda/dd_* %changelog +* Tue Apr 11 2023 Adam Williamson - 38.23.4-2 +- Backport PR #4690 to avoid failing on empty files when reporting bugs + +* Tue Mar 28 2023 Packit - 38.23.4-1 +- Add 'vga' to the list of preserved kernel arguments (#2176782) (awilliam) +- Move ostreecontainer deps to install-img-deps (jkonecny) +- Update translations from Weblate + +* Fri Mar 24 2023 Packit - 38.23.3-1 +- Fix virt-install cockpit run on fedora-X images (jkonecny) +- For user unit tests, provide valid login.defs (vslavik) +- Don't copy binaries in user unit tests (vslavik) +- Don't create empty login.defs (vslavik) +- Generate the ostreesetup kickstart command (vponcova) +- Implement needs_network for rpm_ostree_container (#2125655) (jkonecny) +- Move rpm-ostree deps from Lorax to Anaconda (#2125655) (jkonecny) +- Deduplicate test data creation func in rpm ostree (jkonecny) +- Add release note for ostreecontainer (#2125655) (jkonecny) +- Add new OSTree container source test (#2125655) (jkonecny) +- Enable RPM OSTree from container source in payload (#2125655) (jkonecny) +- Add RPM OSTree source from container (#2125655) (jkonecny) +- fedora-welcome: Default to light style (fmuellner) +- fedora-welcome: Swap buttons (fmuellner) +- fedora-welcome: Drop icons from buttons (fmuellner) +- fedora-welcome: Use libadwaita (fmuellner) +- fedora-welcome: Use actions instead of clicked callbacks (fmuellner) +- fedora-welcome: Port to GTK4 (fmuellner) +- fedora-welcome: Tweak button labels (fmuellner) +- fedora-welcome: Adjust wording of description (fmuellner) +- fedora-welcome: Rename .desktop file (fmuellner) +- fedora-welcome: Add back app icon (fmuellner) +- fedora-welcome: Replace grids with boxes (fmuellner) +- fedora-welcome: Remove secondary screen (fmuellner) +- fedora-welcome: Launch .desktop file instead of spawning command (fmuellner) +- fedora-welcome: Fix passing command line flags (fmuellner) +- fedora-welcome: Use standard Javascript modules (fmuellner) +- fedora-welcome: Split out application subclass (fmuellner) +- fedora-window: Use show_all() only internally (fmuellner) +- fedora-welcome: Stop using deprecated Lang module (fmuellner) +- fedora-welcome: Reindent WelcomeWindow class (fmuellner) +- fedora-welcome: Use consistent quotes (fmuellner) +- fedora-welcome: Use template strings (fmuellner) +- fedora-welcome: Use consistent braces (fmuellner) +- fedora-welcome: Remove unused imports (fmuellner) +- Add config for Fedora Designsuite (luya) +- Update translations from Weblate + +* Thu Mar 09 2023 Packit - 38.23.2-1 +- Retranslate welcome screen more simply (vslavik) +- Fix translations of the pre-release warning dialog (#2165762) (vponcova) +- Update translations from Weblate + +* Thu Feb 16 2023 Packit - 38.23.1-1 +- Apply templates for Fedora 38 (mkolman) +- Fix new pylint detections (vslavik) +- Update translations from Weblate + * Tue Feb 07 2023 Packit - 38.21-1 - Sort RPM versions via rpm.labelCompare() and not via packaging.version.LegacyVersion() (miro) diff --git a/sources b/sources index 6d0af84..9241984 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (anaconda-38.21.tar.bz2) = 4a3d4a5fd8b3b628bf547c5e123c376b68340fc9ee9fb7984879b85343e9c0485eda735cc03299d5aa73271d62dfc588826dea25452e31e476f0074e8c973dc4 +SHA512 (anaconda-38.23.4.tar.bz2) = 88fa6261f7dd12ccc0e469c5662912e5dbcc7f5a521884aa77f943e0a3ad403e2a6d2f6b661fd3a2de71c1a16ef6b3f09add72dd1d7420dc3badc322ab6a3206