Compare commits
78 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b7c04fccdf | ||
|
|
a05f166701 | ||
|
|
69aa69ce9f | ||
|
|
46e4c5cb69 |
||
|
|
26e56e009e | ||
|
|
79a2083f22 | ||
|
|
05088c122a | ||
|
|
ffc3a2cfe4 | ||
|
|
6a0cbd4f54 | ||
|
|
cc02dba574 | ||
|
|
cedabe303c | ||
|
|
9fe63a30e3 | ||
|
|
01d5f7a72d | ||
|
|
57a53f65eb | ||
|
|
03beeaabfe | ||
|
|
10f2788e2e | ||
|
|
bf6ed770f4 | ||
|
|
f21cb2e226 | ||
|
|
b862c5236f | ||
|
|
d045d1ee1d | ||
|
|
f74651e09a | ||
|
|
acc97bad56 | ||
|
|
1d416a1edd | ||
|
|
d003eff4f6 | ||
|
|
62a8f656f7 | ||
|
|
3863ba7579 | ||
|
|
3ed588da80 | ||
|
|
87244d0604 | ||
|
|
cf78f8d0ee | ||
|
|
1e20b7413b | ||
|
|
492d8dd5ab | ||
|
|
0e767184b7 | ||
|
|
22b98ffb7a | ||
|
|
d663ffb93a | ||
|
|
b076ceb696 | ||
|
|
7239772901 | ||
|
|
732517bcf0 | ||
|
|
213a753b33 |
||
|
|
4504feb5ba | ||
|
|
fae5d037f0 | ||
|
|
8b5b9366ca | ||
|
|
ae948af1e4 |
||
|
|
9d5f73f6c2 |
||
|
|
8fc9a5e791 | ||
|
|
4e32b279e6 |
||
|
|
4e66fad703 |
||
|
|
00795d94e9 |
||
|
|
bfa16d53dc |
||
|
|
e5d2c7da8e | ||
|
|
f4fcb9cdd9 | ||
|
|
8874dd69ea | ||
|
|
c0a479988d | ||
|
|
7379c6b819 | ||
|
|
ae2ab9006f | ||
|
|
bd9b7cc977 | ||
|
|
01f144734d | ||
|
|
23f0390c4c | ||
|
|
0e862cd8df | ||
|
|
0680f2ccf6 | ||
|
|
a36c9b6eff | ||
|
|
4456f265f9 | ||
|
|
574e70789c | ||
|
|
963d6215af | ||
|
|
bba065a9f6 | ||
|
|
cca56b7722 | ||
|
|
6b9f8ae13c | ||
|
|
7324d4a8a0 | ||
|
|
40faa8f303 | ||
|
|
1382e24f45 | ||
|
|
59ea618069 | ||
|
|
06d80d5fef | ||
|
|
de771889de | ||
|
|
c6a0f3a1f7 | ||
|
|
6c4e471637 | ||
|
|
82d7f71a7f | ||
|
|
0a7aa1737e | ||
|
|
97b9782493 | ||
|
|
f67255266e |
7 changed files with 1754 additions and 1045 deletions
33
.gitignore
vendored
33
.gitignore
vendored
|
|
@ -90,6 +90,8 @@
|
|||
/osbuild-90.tar.gz
|
||||
/osbuild-91.tar.gz
|
||||
/osbuild-92.tar.gz
|
||||
/osbuild-93.tar.gz
|
||||
/osbuild-94.tar.gz
|
||||
/osbuild-95.tar.gz
|
||||
/osbuild-96.tar.gz
|
||||
/osbuild-97.tar.gz
|
||||
|
|
@ -102,7 +104,6 @@
|
|||
/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
|
||||
|
|
@ -110,7 +111,6 @@
|
|||
/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
|
||||
|
|
@ -120,8 +120,33 @@
|
|||
/osbuild-125.tar.gz
|
||||
/osbuild-126.tar.gz
|
||||
/osbuild-129.tar.gz
|
||||
/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
|
||||
/osbuild-138.tar.gz
|
||||
/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
44
PR1824.patch
|
|
@ -1,44 +0,0 @@
|
|||
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
Normal file
40
PR1827.patch
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
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 0.104.0.
|
||||
The file was generated using packit 1.14.0.post1.dev2+g6506c7467.
|
||||
|
|
|
|||
Binary file not shown.
2678
osbuild.spec
2678
osbuild.spec
File diff suppressed because it is too large
Load diff
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (osbuild-135.tar.gz) = b95ed7b75756845ec1baaecbd7340edee78147daec7985d706f1cb690ef23b5feeef2b172c954bf4136eccab223ee5422f32da401f25f7ef699535a0aa6932df
|
||||
SHA512 (osbuild-169.tar.gz) = 981b6dae05d0f1fe0475549b5c72c2adafb656a7b9f3dbdf64fe660fe0852166bf327f654192f7f83583e2d559590b98dac8aba226e8203c3a0af274d51b33cf
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue