Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › d7a92b1
Detect when a repository is already attached to a package
Marin Atanasov Nikolov committed 14 years ago
commit d7a92b11302551fd69237888a063180216bb1f38
parent dfd375c
1 file changed +16 -0
modified libpkg/pkg_repo.c
@@ -11,6 +11,7 @@
#include "pkg_private.h"



static int pkg_repos_is_reserved_name(struct pkg_repos *repos, struct pkg_repos_entry *re);
+ 
static int pkg_repos_exists_in_pkg(struct pkg *pkg, struct pkg_repos_entry *re);



int

pkg_repo_fetch(struct pkg *pkg)
@@ -164,6 +165,9 @@ pkg_repos_add_in_pkg(struct pkg *pkg, struct pkg_repos_entry *re)


	assert(pkg != NULL && re != NULL);
+ 
	if (pkg_repos_exists_in_pkg(pkg, re) == EPKG_FATAL)
+ 
		return (EPKG_FATAL);
+ 


	if ((newre = calloc(1, sizeof(struct pkg_repos_entry))) == NULL) {

		EMIT_ERRNO("calloc", "pkg_repos_entry");

		return (EPKG_FATAL);
@@ -300,3 +304,15 @@ pkg_repos_is_reserved_name(struct pkg_repos *repos, struct pkg_repos_entry *re)


	return (EPKG_OK);

}
+
+ 
static int
+ 
pkg_repos_exists_in_pkg(struct pkg *pkg, struct pkg_repos_entry *re)
+ 
{
+ 
	struct pkg_repos_entry *tmp = NULL;
+
+ 
	while(pkg_repos_next_in_pkg(pkg, &tmp) == EPKG_OK)
+ 
		if (strcmp(pkg_repos_get_name(tmp), pkg_repos_get_name(re)) == 0)
+ 
			return (EPKG_FATAL);
+
+ 
	return (EPKG_OK);
+ 
}