Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 3be44d5
Prepend attached the repository name by remote- in multi-repos (another fix for #394)
Baptiste Daroussin committed 13 years ago
commit 3be44d58efeace53e13c5fcc34c10d3a3b9f1db9
parent bcd8afe
1 file changed +4 -4
modified libpkg/pkgdb.c
@@ -170,7 +170,7 @@ pkgdb_get_reponame(struct pkgdb *db, const char *repo)
			reponame = repo;

		} else {

			/* default repository in multi-repos is 'default' */
- 
			reponame = "default";
+ 
			reponame = "remote-default";

		}

	} else {

		if (repo != NULL && strcmp(repo, "repo") &&
@@ -664,7 +664,7 @@ pkgdb_open_multirepos(const char *dbdir, struct pkgdb *db)
			return (EPKG_ENODB);

		}
- 
		ret = sql_exec(db->sqlite, "ATTACH '%s' AS '%s';",
+ 
		ret = sql_exec(db->sqlite, "ATTACH '%s' AS 'remote-%s';",

		    remotepath, repo_name);

		if (ret != EPKG_OK) {

			pkgdb_close(db);
@@ -689,7 +689,7 @@ pkgdb_open_multirepos(const char *dbdir, struct pkgdb *db)
		}



		/* check if default repository exists */
- 
		if (!is_attached(db->sqlite, "default")) {
+ 
		if (!is_attached(db->sqlite, "remote-default")) {

			pkg_emit_error("no default repository defined");

			pkgdb_close(db);

			return (EPKG_FATAL);
@@ -3480,7 +3480,7 @@ pkgdb_rquery(struct pkgdb *db, const char *pattern, match_t match,
	/*

	 * Working on multiple remote repositories

	 */
- 
	if (multirepos_enabled && !strcmp(reponame, "default")) {
+ 
	if (multirepos_enabled && !strcmp(reponame, "remote-default")) {

		/* duplicate the query via UNION for all the attached

		 * databases */