Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › b6859a2
scheduler: fix scheduling
Baptiste Daroussin committed 11 months ago
commit b6859a2541e7178bdaef9df5541f57a4cbe893ae
parent 983c94d
5 files changed +41 -45
modified libpkg/pkg_jobs_schedule.c
@@ -156,7 +156,7 @@ pkg_jobs_schedule_graph_edge(struct pkg_solved *a, struct pkg_solved *b)
	}



	if (a_new != NULL && b_new != NULL &&
- 
	    pkg_jobs_schedule_direct_depends(b_new, a_new)) {
+ 
	    pkg_jobs_schedule_direct_depends(a_new, b_new)) {

		if (debug_edges) {

			dbg(4, "  edge to %s %s, new depends on new",

			    pkg_jobs_schedule_job_type_string(b),
modified tests/frontend/conflicts-multirepo.sh
@@ -361,12 +361,10 @@ Installed packages to be UPGRADED:
	test2: 1 -> 1.1 [local2]



Number of packages to be upgraded: 2
- 
${JAILED}[1/3] Deinstalling test2-1...
- 
${JAILED}[1/3] Deleting files for test2-1:  done
- 
${JAILED}[2/3] Upgrading test from 1 to 1.1...
- 
${JAILED}[2/3] Extracting test-1.1:  done
- 
${JAILED}[3/3] Installing test2-1.1...
- 
${JAILED}[3/3] Extracting test2-1.1:  done
+ 
[1/2] Upgrading test2 from 1 to 1.1...
+ 
[1/2] Extracting test2-1.1:  done
+ 
[2/2] Upgrading test from 1 to 1.1...
+ 
[2/2] Extracting test-1.1:  done

"

	atf_check \

		-o inline:"${OUTPUT}" \
modified tests/frontend/conflicts.sh
@@ -150,12 +150,11 @@ Installed packages to be REMOVED:
Number of packages to be removed: 1

Number of packages to be installed: 1

Number of packages to be upgraded: 1
- 
[1/4] Deinstalling foo-1.0...
- 
[2/4] Deinstalling bar-1.0...
- 
[2/4] Deleting files for bar-1.0:  done
- 
[3/4] Installing bar1-1.1...
- 
[3/4] Extracting bar1-1.1:  done
- 
[4/4] Installing foo-1.0_1...
+ 
[1/3] Upgrading foo from 1.0 to 1.0_1...
+ 
[2/3] Deinstalling bar-1.0...
+ 
[2/3] Deleting files for bar-1.0:  done
+ 
[3/3] Installing bar1-1.1...
+ 
[3/3] Extracting bar1-1.1:  done

"



	atf_check \
@@ -353,14 +352,13 @@ 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...
- 
[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...
+ 
[1/5] Installing arp-1.0_1...
+ 
[2/5] Upgrading foo from 1.0 to 1.0_1...
+ 
[3/5] Deinstalling other-1.0...
+ 
[4/5] Deinstalling bar-1.0...
+ 
[4/5] Deleting files for bar-1.0:  done
+ 
[5/5] Installing bar1-1.1...
+ 
[5/5] Extracting bar1-1.1:  done

"



	atf_check \
modified tests/frontend/issue1425.sh
@@ -172,14 +172,14 @@ New packages to be INSTALLED:
	pkgD: 1.0 [repoA]



Number of packages to be installed: 4
- 
${JAILED}[1/4] Installing pkgD-1.0...
- 
${JAILED}[1/4] Extracting pkgD-1.0:  done
- 
${JAILED}[2/4] Installing pkgC-1.0...
- 
${JAILED}[2/4] Extracting pkgC-1.0:  done
- 
${JAILED}[3/4] Installing pkgB-1.0...
- 
${JAILED}[3/4] Extracting pkgB-1.0:  done
- 
${JAILED}[4/4] Installing pkgA-1.0...
- 
${JAILED}[4/4] Extracting pkgA-1.0:  done
+ 
${JAILED}[1/4] Installing pkgA-1.0...
+ 
${JAILED}[1/4] Extracting pkgA-1.0:  done
+ 
${JAILED}[2/4] Installing pkgB-1.0...
+ 
${JAILED}[2/4] Extracting pkgB-1.0:  done
+ 
${JAILED}[3/4] Installing pkgC-1.0...
+ 
${JAILED}[3/4] Extracting pkgC-1.0:  done
+ 
${JAILED}[4/4] Installing pkgD-1.0...
+ 
${JAILED}[4/4] Extracting pkgD-1.0:  done

"



        atf_check \
@@ -246,14 +246,14 @@ New packages to be INSTALLED:
	pkgD: 1.0 [repoA]



Number of packages to be installed: 4
- 
${JAILED}[1/4] Installing pkgD-1.0...
- 
${JAILED}[1/4] Extracting pkgD-1.0:  done
- 
${JAILED}[2/4] Installing pkgC-1.0...
- 
${JAILED}[2/4] Extracting pkgC-1.0:  done
- 
${JAILED}[3/4] Installing pkgB-1.0...
- 
${JAILED}[3/4] Extracting pkgB-1.0:  done
- 
${JAILED}[4/4] Installing pkgA-1.0...
- 
${JAILED}[4/4] Extracting pkgA-1.0:  done
+ 
${JAILED}[1/4] Installing pkgA-1.0...
+ 
${JAILED}[1/4] Extracting pkgA-1.0:  done
+ 
${JAILED}[2/4] Installing pkgB-1.0...
+ 
${JAILED}[2/4] Extracting pkgB-1.0:  done
+ 
${JAILED}[3/4] Installing pkgC-1.0...
+ 
${JAILED}[3/4] Extracting pkgC-1.0:  done
+ 
${JAILED}[4/4] Installing pkgD-1.0...
+ 
${JAILED}[4/4] Extracting pkgD-1.0:  done

"



        atf_check \
modified tests/frontend/issue1440.sh
@@ -207,14 +207,14 @@ New packages to be INSTALLED:
	pkgD: 1.0 [repoB]



Number of packages to be installed: 4
- 
${JAILED}[1/4] Installing pkgD-1.0...
- 
${JAILED}[1/4] Extracting pkgD-1.0:  done
- 
${JAILED}[2/4] Installing pkgC-1.0...
- 
${JAILED}[2/4] Extracting pkgC-1.0:  done
- 
${JAILED}[3/4] Installing pkgB-1.0...
- 
${JAILED}[3/4] Extracting pkgB-1.0:  done
- 
${JAILED}[4/4] Installing pkgA-1.0...
- 
${JAILED}[4/4] Extracting pkgA-1.0:  done
+ 
${JAILED}[1/4] Installing pkgA-1.0...
+ 
${JAILED}[1/4] Extracting pkgA-1.0:  done
+ 
${JAILED}[2/4] Installing pkgB-1.0...
+ 
${JAILED}[2/4] Extracting pkgB-1.0:  done
+ 
${JAILED}[3/4] Installing pkgC-1.0...
+ 
${JAILED}[3/4] Extracting pkgC-1.0:  done
+ 
${JAILED}[4/4] Installing pkgD-1.0...
+ 
${JAILED}[4/4] Extracting pkgD-1.0:  done

"



        atf_check \