mirror of
https://src.fedoraproject.org/rpms/virt-manager.git
synced 2026-01-10 22:11:15 +00:00
Revert several patches pushed by mistake
When fixing cloud init bug in virt-manager 5.1.0 I pushed the changes info f42 branch as well by mistake as we shipped 5.0.0 that doesn't include the bug. Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
@@ -1,32 +0,0 @@
|
||||
From ea71cf9a8a4161ce6e19eacf5f0d86d40ab74f23 Mon Sep 17 00:00:00 2001
|
||||
Message-ID: <ea71cf9a8a4161ce6e19eacf5f0d86d40ab74f23.1767794644.git.phrdina@redhat.com>
|
||||
From: Pavel Hrdina <phrdina@redhat.com>
|
||||
Date: Mon, 29 Sep 2025 16:14:35 +0200
|
||||
Subject: [PATCH] virtinst: cloudinit: include empty meta-data file
|
||||
|
||||
Refactor creation of cloud-init config files introduced a bug where we
|
||||
stopped including empty meta-data file.
|
||||
|
||||
Introduced-by: 5b2d0997a1d2d213b17c227169da64e2fa7d09a6
|
||||
Fixes: https://github.com/virt-manager/virt-manager/issues/975
|
||||
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
||||
---
|
||||
virtinst/install/cloudinit.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/virtinst/install/cloudinit.py b/virtinst/install/cloudinit.py
|
||||
index 3f565f399..b2378fbfa 100644
|
||||
--- a/virtinst/install/cloudinit.py
|
||||
+++ b/virtinst/install/cloudinit.py
|
||||
@@ -36,7 +36,7 @@ class _CloudInitConfig:
|
||||
def _create_file(self):
|
||||
content = self._content()
|
||||
|
||||
- if not content:
|
||||
+ if content is None:
|
||||
return None
|
||||
|
||||
fileobj = tempfile.NamedTemporaryFile(
|
||||
--
|
||||
2.52.0
|
||||
|
||||
2
sources
2
sources
@@ -1 +1 @@
|
||||
SHA512 (virt-manager-5.1.0.tar.xz) = 6306500ae442a6ccb36d5f19bc26b0e32984ca145ee8d41a475e175ee4db6c0d253f0cf9d908c30e3269cf7aabdad4bbd30e84f3cd0477f233da1e43e0235e3c
|
||||
SHA512 (virt-manager-5.0.0.tar.xz) = d0cb7eb844fc98ad29413717e5fa5834bc6f9f6cb6b9339b59c2721bb37a58f71280e3d2a04a64a6021614626329d76c92474f826bb1d9b7a9040b479f20d4e8
|
||||
|
||||
@@ -1,15 +1,14 @@
|
||||
# -*- rpm-spec -*-
|
||||
|
||||
%global default_hvs "qemu,xen,lxc"
|
||||
%global have_spice %{defined fedora}
|
||||
|
||||
%global with_guestfs 0
|
||||
%global default_hvs "qemu,xen,lxc"
|
||||
|
||||
|
||||
# End local config
|
||||
|
||||
Name: virt-manager
|
||||
Version: 5.1.0
|
||||
Release: 3%{?dist}
|
||||
Version: 5.0.0
|
||||
Release: 2%{?dist}
|
||||
%global verrel %{version}-%{release}
|
||||
|
||||
Summary: Desktop tool for managing virtual machines via libvirt
|
||||
@@ -18,14 +17,13 @@ BuildArch: noarch
|
||||
URL: https://virt-manager.org/
|
||||
Source0: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.xz
|
||||
|
||||
Patch1: 0001-virtinst-cloudinit-include-empty-meta-data-file.patch
|
||||
|
||||
Requires: virt-manager-common = %{verrel}
|
||||
Requires: python3-gobject >= 3.31.3
|
||||
Requires: gtk3 >= 3.22.0
|
||||
Requires: libvirt-glib >= 0.0.9
|
||||
Requires: gtk-vnc2
|
||||
%if %{have_spice}
|
||||
%if 0%{?fedora}
|
||||
Requires: spice-gtk3
|
||||
%endif
|
||||
|
||||
@@ -113,13 +111,8 @@ machine).
|
||||
|
||||
|
||||
%build
|
||||
%if ! %{have_spice}
|
||||
%global _default_graphics -Ddefault-graphics=vnc
|
||||
%endif
|
||||
|
||||
%meson \
|
||||
-Ddefault-hvs=%{default_hvs} \
|
||||
%{?_default_graphics} \
|
||||
-Dupdate-icon-cache=false \
|
||||
-Dcompile-schemas=false \
|
||||
-Dtests=disabled
|
||||
@@ -176,21 +169,6 @@ machine).
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Jan 07 2026 Pavel Hrdina <phrdina@redhat.com> - 5.1.0.3
|
||||
- Fix cloud init
|
||||
|
||||
* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 5.1.0-2
|
||||
- Rebuilt for Python 3.14.0rc3 bytecode
|
||||
|
||||
* Tue Aug 26 2025 Pavel Hrdina <phrdina@redhat.com> - 5.1.0-1
|
||||
- Update to version 5.1.0
|
||||
|
||||
* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 5.0.0-4
|
||||
- Rebuilt for Python 3.14.0rc2 bytecode
|
||||
|
||||
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
|
||||
Reference in New Issue
Block a user