d13a65e fix splitted upgrade job — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

fix splitted upgrade job

Baptiste Daroussin committed 11 years ago

commit d13a65e73e2ac43c45b4c99c4ca55476d8352462
parent f13f113

2 files changed +9 -4

modified libpkg/pkg_jobs.c

@@ -617,6 +617,8 @@ pkg_jobs_set_execute_priority(struct pkg_jobs *j, struct pkg_solved *solved)

 			ts->type = PKG_SOLVED_UPGRADE_REMOVE;
 			ts->items[0] = solved->items[1];
 			solved->items[1] = NULL;
 			solved->type = PKG_SOLVED_INSTALL;
 			DL_APPEND(j->jobs, ts);
 			j->count ++;
 			solved->already_deleted = true;

modified tests/frontend/packagesplit.shin

@@ -12,6 +12,7 @@ package_split_body() {

 	tmpdir=`pwd`
 	touch file1
 	touch file2
 	cat << EOF >> pkg1.ucl
 name: test
 origin: test

@@ -25,8 +26,8 @@ desc: <<EOD

 Yet another test
 EOD
 files: {
     ${tmpdir}/file1: "1a27340cd0ef9fbaf340d81b72419a071e38cda2ae2bc75ec4d7ae04362d0f43",
     ${tmpdir}/file2: "1a27340cd0ef9fbaf340d81b72419a071e38cda2ae2bc75ec4d7ae04362d0f43",
     ${tmpdir}/file1: "",
     ${tmpdir}/file2: "",
 }
 EOF

@@ -113,7 +114,7 @@ EOF

 			-o match:".*Installing.*\.\.\.$" \
 			-e empty \
 			-s exit:0 \
 			pkg register -t -M ${p}.ucl
 			pkg register -M ${p}.ucl
 	done
 	for p in dep1 pkg2 pkg3 pkg4; do

@@ -138,9 +139,11 @@ local: {

 EOF
 	atf_check \
 		-o ignore \
 		-e ignore \
 		-e empty \
 		-s exit:0 \
 		pkg -o REPOS_DIR="$tmpdir" -o PKG_CACHEDIR="$tmpdir" upgrade -y
 	test -f file1 || atf_fail "file1 is not present"
 }
 atf_init_test_cases() {