Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 7e1ddf8
Solver: ensure reverse dependencies are checked
Baptiste Daroussin committed 5 years ago
commit 7e1ddf82538093f873bf971734027ab71a13e5ec
parent c669013
2 files changed +194 -1
modified libpkg/pkg_jobs_universe.c
@@ -240,20 +240,28 @@ pkg_jobs_universe_process_deps(struct pkg_jobs_universe *universe,
	int (*deps_func)(const struct pkg *pkg, struct pkg_dep **d);

	int rc;

	struct pkg_job_universe_item *unit;
- 
	struct pkg *npkg, *rpkg;
+ 
	struct pkg *npkg, *rpkg, *lpkg;

	pkg_chain_t *rpkgs = NULL;

	bool found = false;



	rpkg = NULL;



	if (flags & DEPS_FLAG_REVERSE) {
+ 
		pkg_debug(4, "Processing rdeps for %s (%s)", pkg->uid, pkg->type == PKG_INSTALLED ? "installed" : "remote");
+ 
		if (pkg->type != PKG_INSTALLED) {
+ 
			lpkg = pkg_jobs_universe_get_local(universe, pkg->uid, 0);
+ 
			if (lpkg != NULL)
+ 
				return (pkg_jobs_universe_process_deps(universe, lpkg, flags));
+ 
		}

		deps_func = pkg_rdeps;

	}

	else {
+ 
		pkg_debug(4, "Processing deps for %s", pkg->uid);

		deps_func = pkg_deps;

	}



	while (deps_func(pkg, &d) == EPKG_OK) {
+ 
		pkg_debug(4, "Processing *deps for %s: %s", pkg->uid, d->uid);

		HASH_FIND_STR(universe->items, d->uid, unit);

		if (unit != NULL) {

			continue;
@@ -564,6 +572,8 @@ pkg_jobs_universe_process_item(struct pkg_jobs_universe *universe, struct pkg *p
	pkg_jobs_t type = universe->j->type;

	struct pkg_job_universe_item *found;
+ 
	pkg_debug(4, "Processing item %s\n", pkg->uid);
+ 


	job_flags = universe->j->flags;



	/*
modified tests/frontend/conflicts.sh
@@ -3,6 +3,7 @@
. $(atf_get_srcdir)/test_environment.sh



tests_init \
+ 
	more_complex_choice \

	complex_conflicts \

	fileexists_notinpkg \

	find_conflicts
@@ -171,6 +172,188 @@ Number of packages to be upgraded: 1
		pkg info

}
+ 
# install foo
+ 
# foo depends on bar-1.0
+ 
# foo is upgraded to new dep on bar1-1.0 & bar is updated to 2.0
+ 
# other still depends on bar1-1.0
+ 
# bar1 and bar conflict with each other
+ 
more_complex_choice_body()
+ 
{
+ 
	echo "bar-1.0" > file1
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg bar bar 1.0 "${TMPDIR}"
+ 
	cat << EOF >> bar.ucl
+ 
files: {
+ 
	${TMPDIR}/file1: "",
+ 
}
+ 
EOF
+
+ 
	atf_check \
+ 
		-o empty \
+ 
		-e empty \
+ 
		-s exit:0 \
+ 
		pkg create -M ./bar.ucl -o ./repo/
+
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg foo foo 1.0 "${TMPDIR}"
+ 
	cat << EOF >> foo.ucl
+ 
deps: {
+ 
	bar: {
+ 
		origin: "bar",
+ 
		version: "1.0"
+ 
	}
+ 
}
+ 
EOF
+
+ 
	atf_check \
+ 
		-o empty \
+ 
		-e empty \
+ 
		-s exit:0 \
+ 
		pkg create -M ./foo.ucl -o ./repo/
+
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg other other 1.0 "${TMPDIR}"
+ 
	cat << EOF >> other.ucl
+ 
deps: {
+ 
	bar: {
+ 
		origin: "bar",
+ 
		version: "1.0"
+ 
	}
+ 
}
+ 
EOF
+
+ 
	atf_check pkg create -M ./other.ucl -o ./repo/
+
+ 
	cat << EOF > pkg.conf
+ 
PKG_DBDIR=${TMPDIR}
+ 
REPOS_DIR=[]
+ 
repositories: {
+ 
	local: { url : file://${TMPDIR}/repo }
+ 
}
+ 
EOF
+
+ 
	atf_check \
+ 
		-o inline:"Creating repository in ./repo:  done\nPacking files for repository:  done\n" \
+ 
		-e empty \
+ 
		-s exit:0 \
+ 
		pkg -C ./pkg.conf repo ./repo
+
+ 
	atf_check \
+ 
		-o ignore \
+ 
		-s exit:0 \
+ 
		pkg -C ./pkg.conf update -f
+
+ 
	atf_check \
+ 
		-o match:"Installing foo-1\.0" \
+ 
		-o match:"Installing other-1\.0" \
+ 
		-s exit:0 \
+ 
		pkg -C ./pkg.conf install -y foo other
+
+ 
	# Upgrade bar
+ 
	rm -fr repo
+ 
	echo "bar-2.0" > file1
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg bar bar 2.0 "${TMPDIR}"
+ 
	cat << EOF >> bar.ucl
+ 
files: {
+ 
	${TMPDIR}/file1: "",
+ 
}
+ 
EOF
+
+ 
	atf_check \
+ 
		-o empty \
+ 
		-e empty \
+ 
		-s exit:0 \
+ 
		pkg create -M ./bar.ucl -o ./repo/
+
+ 
	# Create bar1-1.1
+ 
	echo "bar-1.1" > file1
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg bar1 bar1 1.1 "${TMPDIR}"
+ 
	cat << EOF >> bar1.ucl
+ 
files: {
+ 
	${TMPDIR}/file1: "",
+ 
}
+ 
EOF
+
+ 
	atf_check \
+ 
		-o empty \
+ 
		-e empty \
+ 
		-s exit:0 \
+ 
		pkg create -M ./bar1.ucl -o ./repo/
+
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg foo foo 1.0_1 "${TMPDIR}"
+ 
	cat << EOF >> foo.ucl
+ 
deps: {
+ 
	bar1: {
+ 
		origin: "bar1",
+ 
		version: "1.1"
+ 
	}
+ 
}
+ 
EOF
+
+ 
	atf_check \
+ 
		-o empty \
+ 
		-e empty \
+ 
		-s exit:0 \
+ 
		pkg create -M ./foo.ucl -o ./repo/
+
+ 
	atf_check \
+ 
		-o inline:"Creating repository in ./repo:  done\nPacking files for repository:  done\n" \
+ 
		-e empty \
+ 
		-s exit:0 \
+ 
		pkg -C ./pkg.conf repo ./repo
+
+ 
	atf_check \
+ 
		-o ignore \
+ 
		-e empty \
+ 
		-s exit:0 \
+ 
		pkg -C ./pkg.conf update -f
+
+ 
OUTPUT="Updating local repository catalogue...
+ 
local repository is up to date.
+ 
All repositories are up to date.
+ 
Checking for upgrades (2 candidates):  done
+ 
Processing candidates (2 candidates):  done
+ 
Checking integrity... done (2 conflicting)
+ 
  - bar1-1.1 conflicts with bar-2.0 on ${TMPDIR}/file1
+ 
  - bar1-1.1 conflicts with bar-1.0 on ${TMPDIR}/file1
+ 
Cannot solve problem using SAT solver, trying another plan
+ 
Checking integrity... done (0 conflicting)
+ 
The following 4 package(s) will be affected (of 0 checked):
+
+ 
Installed packages to be REMOVED:
+ 
	bar: 1.0
+ 
	other: 1.0
+
+ 
New packages to be INSTALLED:
+ 
	bar1: 1.1
+
+ 
Installed packages to be UPGRADED:
+ 
	foo: 1.0 -> 1.0_1
+
+ 
Number of packages to be removed: 2
+ 
Number of packages to be installed: 1
+ 
Number of packages to be upgraded: 1
+ 
[1/4] Deinstalling other-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] Upgrading foo from 1.0 to 1.0_1...
+ 
"
+
+ 
	atf_check \
+ 
		-o inline:"${OUTPUT}" \
+ 
		-e empty \
+ 
		-s exit:0 \
+ 
		pkg -C ./pkg.conf upgrade -y
+
+ 
	atf_check \
+ 
		-o match:"foo-1.0_1" \
+ 
		-o match:"bar1-1.1" \
+ 
		-o not-match:"other-1.0" \
+ 
		-o not-match:"bar-2.0" \
+ 
		-e empty \
+ 
		-s exit:0 \
+ 
		pkg info
+ 
}
+ 


fileexists_notinpkg_body()

{

	mkdir -p ${TMPDIR}/target/${TMPDIR}