6462305 Fix automatic propagation — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Fix automatic propagation

Vsevolod Stakhov committed 10 years ago

commit 64623058335260701ad34eb34347664694932e89
parent 7d6423d

1 file changed +28 -4

modified libpkg/pkg_jobs.c

@@ -1278,8 +1278,9 @@ pkg_jobs_propagate_automatic(struct pkg_jobs *j)

 				unit->pkg->automatic = automatic;
 			}
 			else {
 				if (j->type == PKG_JOBS_INSTALL)
 				if (j->type == PKG_JOBS_INSTALL) {
 					unit->pkg->automatic = false;
 				}
 			}
 		}
 		else {

@@ -1296,10 +1297,33 @@ pkg_jobs_propagate_automatic(struct pkg_jobs *j)

 					break;
 				}
 			}
 			if (local != NULL)
 				LL_FOREACH(unit, cur)
 					if (cur->pkg->type != PKG_INSTALLED)
 			if (local != NULL) {
 				LL_FOREACH(unit, cur) {
 					/*
 					 * Propagate automatic from local package
 					 */
 					if (cur->pkg->type != PKG_INSTALLED) {
 						cur->pkg->automatic = automatic;
 					}
 				}
 			}
 			else {
 				/*
 				 * For packages that are not unique, we might still have
 				 * a situation when we need to set automatic for all
 				 * non-local packages
 				 *
 				 * See #1374
 				 */
 				HASH_FIND_STR(j->request_add, unit->pkg->uid, req);
 				if ((req == NULL || req->automatic)) {
 					automatic = true;
 					pkg_debug(2, "set automatic flag for %s", unit->pkg->uid);
 					LL_FOREACH(unit, cur) {
 						cur->pkg->automatic = automatic;
 					}
 				}
 			}
 		}
 	}
 }