Compare commits
38 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8c13fe86f6 | ||
|
|
548a6fbebd | ||
|
|
d133af82d1 | ||
|
|
183f0f73f9 | ||
|
|
7698bb4f38 | ||
|
|
b2c970ad7f | ||
|
|
26017f0b16 | ||
|
|
16ae11cba5 | ||
|
|
6904f87097 | ||
|
|
46d97d6b9e | ||
|
|
18434c305d | ||
|
|
db216063c5 | ||
|
|
10ce87c9e6 | ||
|
|
31837af976 | ||
|
|
b55897f821 | ||
|
|
a44f08c2e8 | ||
|
|
bd1de23930 |
||
|
|
39d077f91d | ||
|
|
b25a47188c | ||
|
|
ff988dbefe | ||
|
|
d19045945e | ||
|
|
bf052d6af0 |
||
|
|
9427d9c904 |
||
|
|
f221165493 |
||
|
|
12364260b9 |
||
|
|
763f6c2c91 |
||
|
|
c9700e2c47 | ||
|
|
3382b4aad4 | ||
|
|
7c6ee2d53b | ||
|
|
268d95a9a0 | ||
|
|
6330095e8a | ||
|
|
c3698d4b1f | ||
|
|
dbceb4e4b7 | ||
|
|
b6f5920c2d | ||
|
|
7ddb1ca178 | ||
|
|
c7e5d106c3 | ||
|
|
c25e476c58 | ||
|
|
812dbfd56d |
6 changed files with 1241 additions and 1631 deletions
20
.gitignore
vendored
20
.gitignore
vendored
|
|
@ -104,6 +104,7 @@
|
|||
/osbuild-104.tar.gz
|
||||
/osbuild-105.tar.gz
|
||||
/osbuild-106.tar.gz
|
||||
/osbuild-108.tar.gz
|
||||
/osbuild-109.tar.gz
|
||||
/osbuild-110.tar.gz
|
||||
/osbuild-111.tar.gz
|
||||
|
|
@ -111,6 +112,7 @@
|
|||
/osbuild-113.tar.gz
|
||||
/osbuild-114.tar.gz
|
||||
/osbuild-115.tar.gz
|
||||
/osbuild-116.tar.gz
|
||||
/osbuild-117.tar.gz
|
||||
/osbuild-118.tar.gz
|
||||
/osbuild-119.tar.gz
|
||||
|
|
@ -123,6 +125,8 @@
|
|||
/osbuild-130.tar.gz
|
||||
/osbuild-131.tar.gz
|
||||
/osbuild-132.tar.gz
|
||||
/osbuild-133.tar.gz
|
||||
/osbuild-134.tar.gz
|
||||
/osbuild-135.tar.gz
|
||||
/osbuild-136.tar.gz
|
||||
/osbuild-137.tar.gz
|
||||
|
|
@ -130,23 +134,7 @@
|
|||
/osbuild-139.tar.gz
|
||||
/osbuild-140.tar.gz
|
||||
/osbuild-141.tar.gz
|
||||
/osbuild-142.tar.gz
|
||||
/osbuild-143.tar.gz
|
||||
/osbuild-144.tar.gz
|
||||
/osbuild-146.tar.gz
|
||||
/osbuild-147.tar.gz
|
||||
/osbuild-149.tar.gz
|
||||
/osbuild-151.tar.gz
|
||||
/osbuild-152.tar.gz
|
||||
/osbuild-153.tar.gz
|
||||
/osbuild-155.tar.gz
|
||||
/osbuild-156.tar.gz
|
||||
/osbuild-158.tar.gz
|
||||
/osbuild-159.tar.gz
|
||||
/osbuild-161.tar.gz
|
||||
/osbuild-162.tar.gz
|
||||
/osbuild-163.tar.gz
|
||||
/osbuild-164.tar.gz
|
||||
/osbuild-166.tar.gz
|
||||
/osbuild-167.tar.gz
|
||||
/osbuild-169.tar.gz
|
||||
|
|
|
|||
44
PR1824.patch
Normal file
44
PR1824.patch
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
From 2a69d10da676d067bf42b936114d3785fd1c37da Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hozza?= <thozza@redhat.com>
|
||||
Date: Thu, 25 Jul 2024 10:27:44 +0200
|
||||
Subject: [PATCH] Test: fix dnf4.mark stage test with DNF5
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
DNF5 contains a breaking change in the repoquery --qf output,
|
||||
specifically it does not include the trailing newline. This breaks the
|
||||
test case e.g. on the latest Fedora Rawhide [1].
|
||||
|
||||
As a fix, explicitly use 'dnf4' for now, until the inconsistency is
|
||||
fixed in the upstream [2].
|
||||
|
||||
[1] https://artifacts.dev.testing-farm.io/3a3a2898-0a6a-42eb-8792-660f03c35c3c/
|
||||
[2] https://github.com/rpm-software-management/dnf5/issues/709
|
||||
|
||||
Signed-off-by: Tomáš Hozza <thozza@redhat.com>
|
||||
---
|
||||
test/run/test_stages.py | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/test/run/test_stages.py b/test/run/test_stages.py
|
||||
index a4d78b7e..ca224f07 100644
|
||||
--- a/test/run/test_stages.py
|
||||
+++ b/test/run/test_stages.py
|
||||
@@ -537,9 +537,12 @@ class TestStages(test.TestBase):
|
||||
assert os.path.isdir(tree)
|
||||
|
||||
# we're going to verify that packages in the tree are marked according to
|
||||
+ # Explicitly use 'dnf4' for now, because 'dnf5' contains a breaking change
|
||||
+ # in the repoquery --qf output, specifically it does not add a trailing newline.
|
||||
+ # We can use plan 'dnf' again once https://github.com/rpm-software-management/dnf5/issues/709 is fixed.
|
||||
r = subprocess.run(
|
||||
[
|
||||
- "dnf",
|
||||
+ "dnf4",
|
||||
"--installroot", tree,
|
||||
"repoquery", "--installed",
|
||||
"--qf", "%{name},%{reason}"
|
||||
--
|
||||
2.45.2
|
||||
|
||||
40
PR1827.patch
40
PR1827.patch
|
|
@ -1,40 +0,0 @@
|
|||
From 54c0a2cce45ad385d793d494e62222cd254a866a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hozza?= <thozza@redhat.com>
|
||||
Date: Wed, 31 Jul 2024 18:12:24 +0200
|
||||
Subject: [PATCH] Test/dnf4.mark: adjust the test for markings used by DNF5
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
When I rolled back from using 'dnf4', to check package markings, to
|
||||
using 'dnf', I didn't verify the test case on Fedora Rawhide with DNF5.
|
||||
It turns out that the strings reported by DNF5 differ and make the test
|
||||
case fail. This time I tested the change on Fedora Rawhide with DNF5 and
|
||||
it works.
|
||||
|
||||
Signed-off-by: Tomáš Hozza <thozza@redhat.com>
|
||||
---
|
||||
test/run/test_stages.py | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/test/run/test_stages.py b/test/run/test_stages.py
|
||||
index dc91bf8f..7fec10c8 100644
|
||||
--- a/test/run/test_stages.py
|
||||
+++ b/test/run/test_stages.py
|
||||
@@ -565,9 +565,11 @@ class TestStages(test.TestBase):
|
||||
raise
|
||||
|
||||
if package == "dnf":
|
||||
- assert mark == "user"
|
||||
+ # dnf4 marks packages as 'user', while dnf5 marks them as 'User'
|
||||
+ assert mark in ("user", "User")
|
||||
else:
|
||||
- assert mark == "unknown"
|
||||
+ # dnf4 marks packages as 'unknown', while dnf5 marks them as 'External User'
|
||||
+ assert mark in ("unknown", "External User")
|
||||
|
||||
@unittest.skipUnless(test.TestBase.has_filesystem_support("btrfs"), "btrfs needed")
|
||||
def test_btrfs(self):
|
||||
--
|
||||
2.45.2
|
||||
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
This repository is maintained by packit.
|
||||
https://packit.dev/
|
||||
The file was generated using packit 1.14.0.post1.dev2+g6506c7467.
|
||||
The file was generated using packit 1.6.0.post1.dev2+gd5a7662a.
|
||||
|
|
|
|||
2764
osbuild.spec
2764
osbuild.spec
File diff suppressed because it is too large
Load diff
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (osbuild-169.tar.gz) = 981b6dae05d0f1fe0475549b5c72c2adafb656a7b9f3dbdf64fe660fe0852166bf327f654192f7f83583e2d559590b98dac8aba226e8203c3a0af274d51b33cf
|
||||
SHA512 (osbuild-147.tar.gz) = 0a40939ebc088137512e48a6c32937513a602e6c8444d763e0f1b1e000c50256a3b526d05e781b3a930f0e24336a9489fe4f6767c7406a2494fec05a56f81710
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue