f42061c Fix fetch job. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Fix fetch job.

Vsevolod Stakhov committed 12 years ago

commit f42061c3f3891deb2dabe450b15e08a5a238f3c1
parent d32a6d9

2 files changed +3 -2

modified libpkg/pkg_solve.c

@@ -903,7 +903,8 @@ pkg_solve_insert_res_job (struct pkg_solve_variable *var,

 		}
 		else if (seen_del == 0 && seen_add != 0) {
 			res->items[0] = add_var->unit;
 			res->type = PKG_SOLVED_INSTALL;
 			res->type = (j->type == PKG_JOBS_FETCH) ?
 					PKG_SOLVED_FETCH : PKG_SOLVED_INSTALL;
 			DL_APPEND(j->jobs, res);
 			pkg_debug(3, "pkg_solve: schedule installation of %s %s",
 					add_var->origin, add_var->digest);

modified src/fetch.c

@@ -73,7 +73,7 @@ exec_fetch(int argc, char **argv)

 			match = MATCH_ALL;
 			break;
 		case 'd':
 			f |= PKG_FLAG_WITH_DEPS;
 			f |= PKG_FLAG_WITH_DEPS | PKG_FLAG_RECURSIVE;
 			break;
 		case 'g':
 			match = MATCH_GLOB;