Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 3709dcd
scheduler: fix ordering of split upgrade jobs
Isaac Freund committed 8 months ago
commit 3709dcd7cb889a2e76174f51657a59182ed7096b
parent b9ec697
2 files changed +5 -5
modified libpkg/pkg_jobs_schedule.c
@@ -255,7 +255,7 @@ pkg_jobs_schedule_cmp_available(const void *va, const void *vb)
	struct pkg_solved *a = *(struct pkg_solved **)va;

	struct pkg_solved *b = *(struct pkg_solved **)vb;
- 
	int ret = pkg_jobs_schedule_priority(b) - pkg_jobs_schedule_priority(a);
+ 
	int ret = pkg_jobs_schedule_priority(a) - pkg_jobs_schedule_priority(b);

	if (ret == 0) {

		/* Falling back to lexicographical ordering ensures that job execution

		 * order is always consistent and makes testing easier. */
modified tests/frontend/conflicts.sh
@@ -354,14 +354,14 @@ Installed packages to be REMOVED:
Number of packages to be removed: 2

Number of packages to be installed: 2

Number of packages to be upgraded: 1
- 
[1/6] Deinstalling foo-1.0...
- 
[2/6] Deinstalling other-1.0...
+ 
[1/6] Deinstalling other-1.0...
+ 
[2/6] Deinstalling foo-1.0...

[3/6] Deinstalling bar-1.0...

[3/6] Deleting files for bar-1.0:  done

[4/6] Installing bar1-1.1...

[4/6] Extracting bar1-1.1:  done
- 
[5/6] Installing arp-1.0_1...
- 
[6/6] Installing foo-1.0_1...
+ 
[5/6] Installing foo-1.0_1...
+ 
[6/6] Installing arp-1.0_1...

"



	atf_check \