Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 3037cc2
Fix automatic flag setting.
Vsevolod Stakhov committed 12 years ago
commit 3037cc26d4f18b96d55d4d7e2520dadfb738fd40
parent 2bf1f6a
2 files changed +8 -8
modified libpkg/pkg_jobs.c
@@ -378,10 +378,14 @@ pkg_jobs_add_universe(struct pkg_jobs *j, struct pkg *pkg, int priority, bool re
				}

			}

		}
+ 
		pkg_set(npkg, PKG_AUTOMATIC, (int64_t)true);

		if (pkg_jobs_add_universe(j, npkg, priority + 1, recursive) != EPKG_OK)

			return (EPKG_FATAL);
- 
		if (rpkg != NULL && pkg_jobs_add_universe(j, rpkg, priority + 1, recursive) != EPKG_OK)
- 
			return (EPKG_FATAL);
+ 
		if (rpkg != NULL) {
+ 
			if (pkg_jobs_add_universe(j, rpkg, priority + 1, recursive) != EPKG_OK)
+ 
				return (EPKG_FATAL);
+ 
			pkg_set(rpkg, PKG_AUTOMATIC, (int64_t)true);
+ 
		}

	}



	/* Go through all rdeps */
@@ -906,10 +910,8 @@ newer_than_local_pkg(struct pkg_jobs *j, struct pkg *rp, bool force)
	lp = get_local_pkg(j, origin, 0);



	/* obviously yes because local doesn't exists */
- 
	if (lp == NULL) {
- 
		pkg_set(rp, PKG_AUTOMATIC, (int64_t)true);
+ 
	if (lp == NULL)

		return (true);
- 
	}



	pkg_get(lp, PKG_AUTOMATIC, &automatic,

	    PKG_VERSION, &oldversion,
modified src/utils.c
@@ -589,7 +589,6 @@ print_jobs_summary_pkg(struct pkg *new_pkg, struct pkg *old_pkg,
					   assume a checksum mismatch will

					   occur later and the file will be

					   fetched from remote again */
- 


			*dlsize += pkgsize;



		if (old_pkg != NULL) {
@@ -627,8 +626,7 @@ print_jobs_summary_pkg(struct pkg *new_pkg, struct pkg *old_pkg,
		}

		break;

	case PKG_SOLVED_DELETE:
- 
		*oldsize += oldflatsize;
- 
		*newsize += flatsize;
+ 
		*oldsize += flatsize;



		pkg_printf("\tRemoving %n-%v\n", new_pkg, new_pkg);

		break;