Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › c8dd4e0
pkg upgrade now does not change automatic flag.
Vsevolod Stakhov committed 11 years ago
commit c8dd4e0748206d0adc6b08ab635947029aef6a88
parent 9a1f209
1 file changed +13 -2
modified libpkg/pkg_jobs.c
@@ -1657,8 +1657,10 @@ pkg_jobs_propagate_automatic(struct pkg_jobs *j)
				pkg_set(unit->pkg, PKG_AUTOMATIC, automatic);

			}

			else {
- 
				automatic = 0;
- 
				pkg_set(unit->pkg, PKG_AUTOMATIC, automatic);
+ 
				if (!unit->reinstall || j->type == PKG_JOBS_INSTALL) {
+ 
					automatic = 0;
+ 
					pkg_set(unit->pkg, PKG_AUTOMATIC, automatic);
+ 
				}

			}

		}

		else {
@@ -1675,6 +1677,15 @@ pkg_jobs_propagate_automatic(struct pkg_jobs *j)
				}

			}

			if (local != NULL) {
+ 
				/*
+ 
				 * Turn off automatic22 flags for install job if
+ 
				 * a package was1 explicitly requested to be installed
+ 
				 */
+ 
				if (j->type == PKG_JOBS_INSTALL) {
+ 
					HASH_FIND_STR(j->request_add, uid, req);
+ 
					if (req != NULL)
+ 
						automatic = 0;
+ 
				}

				LL_FOREACH(unit, cur) {

					if (cur->pkg->type != PKG_INSTALLED) {

						pkg_set(cur->pkg, PKG_AUTOMATIC, automatic);