Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 30e41e7
Try to register local conflicts.
Vsevolod Stakhov committed 12 years ago
commit 30e41e7bacce46921b206a3f547f1dd8f4d98421
parent d610313
1 file changed +47 -24
modified libpkg/pkg_jobs.c
@@ -635,6 +635,48 @@ end:
}



static int
+ 
pkg_jobs_register_remote_conflicts(struct pkg_jobs *j, const char *origin, struct pkg *rp, int priority)
+ 
{
+ 
	struct pkg *lp;
+ 
	struct pkgdb_it *it = NULL;
+ 
	const char *lorigin;
+ 
	int lflags = PKG_LOAD_BASIC | PKG_LOAD_FILES | PKG_LOAD_SCRIPTS |
+ 
		    PKG_LOAD_DIRS;
+ 
	struct pkg_conflict *c1, *c2;
+
+ 
	it = pkgdb_integrity_conflict_local(j->db, origin);
+
+ 
	if (it != NULL) {
+ 
		lp = NULL;
+ 
		while (pkgdb_it_next(it, &lp, lflags) == EPKG_OK) {
+ 
			pkg_get(lp, PKG_ORIGIN, &lorigin);
+ 
			pkg_jobs_add_universe(j, lp, priority, true);
+ 
			/* Register conflicts */
+ 
			pkg_conflict_new(&c1);
+ 
			pkg_conflict_new(&c2);
+ 
			if (c1 != NULL && c2 != NULL) {
+ 
				sbuf_set(&c1->origin, lorigin);
+ 
				sbuf_set(&c2->origin, origin);
+ 
				pkg_debug(2, "registering conflict between remote %s and local %s", origin, lorigin);
+ 
				HASH_ADD_KEYPTR(hh, rp->conflicts, lorigin, strlen(lorigin), c1);
+ 
				HASH_ADD_KEYPTR(hh, lp->conflicts, origin, strlen(origin), c2);
+ 
			}
+
+ 
			/* Special case for locked packages */
+ 
			if (pkg_is_locked(lp)) {
+ 
				pkg_emit_locked(lp);
+ 
				pkgdb_it_free(it);
+ 
				return (EPKG_LOCKED);
+ 
			}
+ 
			lp = NULL;
+ 
		}
+ 
		pkgdb_it_free(it);
+ 
	}
+
+ 
	return (EPKG_OK);
+ 
}
+
+ 
static int

find_remote_pkg(struct pkg_jobs *j, const char *pattern, match_t m, bool root, int priority)

{

	struct pkg *p = NULL;
@@ -702,9 +744,13 @@ find_remote_pkg(struct pkg_jobs *j, const char *pattern, match_t m, bool root, i
		rc = EPKG_OK;

		p->direct = root;

		/* Add a package to request chain and populate universe */
- 
		pkg_jobs_add_req(j, origin, p, true, priority);
+ 
		if (pkg_jobs_register_remote_conflicts(j, origin, p, priority) == EPKG_OK) {
+ 
			/* Do not request packages with a conflict with locked installed packages */
+ 
			pkg_jobs_add_req(j, origin, p, true, priority);
+ 
		}

		rc = pkg_jobs_add_universe(j, p, priority, true);
+ 


		p = NULL;

	}
@@ -1175,29 +1221,6 @@ pkg_jobs_type(struct pkg_jobs *j)
}



static int
- 
pkg_jobs_keep_files_to_del(struct pkg *p1, struct pkg *p2)
- 
{
- 
	struct pkg_file *f = NULL;
- 
	struct pkg_dir *d = NULL;
-
- 
	while (pkg_files(p1, &f) == EPKG_OK) {
- 
		if (f->keep)
- 
			continue;
-
- 
		f->keep = pkg_has_file(p2, pkg_file_path(f));
- 
	}
-
- 
	while (pkg_dirs(p1, &d) == EPKG_OK) {
- 
		if (d->keep)
- 
			continue;
-
- 
		d->keep = pkg_has_dir(p2, pkg_dir_path(d));
- 
	}
-
- 
	return (EPKG_OK);
- 
}
-
- 
static int

pkg_jobs_handle_install(struct pkg_solved *ps, struct pkg_jobs *j, bool handle_rc,

		const char *cachedir, struct pkg_manifest_key *keys)

{