7c5baa2 pkg version with remote repo must use pkgname for -n instead of hardcoded origin — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

pkg version with remote repo must use pkgname for -n instead of hardcoded origin

Andrej Zverev committed 9 years ago

commit 7c5baa2a96c04c952a89fe8c8cf7e385365fa205
parent 80c1fe4

1 file changed +8 -3

modified src/version.c

@@ -488,6 +488,7 @@ do_source_remote(unsigned int opt, char limchar, char *pattern, match_t match,

 	const char	*name;
 	const char	*origin;
 	const char	*version_remote;
 	bool		is_origin;
 	int		 retcode = EPKG_OK;

@@ -526,15 +527,19 @@ do_source_remote(unsigned int opt, char limchar, char *pattern, match_t match,

 		/* If -O was specified, check if this origin matches */
 		if ((opt & VERSION_WITHORIGIN) &&
 		    strcmp(origin, matchorigin) != 0)
 		    strcmp(origin, matchorigin) != 0) {
 		    	is_origin = true;
 			continue;
 		}
 		/* If -n was specified, check if this name matches */
 		if ((opt & VERSION_WITHNAME) &&
 		    strcmp(name, matchname) != 0)
 		    strcmp(name, matchname) != 0) {
 		    	is_origin = false;
 			continue;
 		}
 		it_remote = pkgdb_repo_query(db, origin, MATCH_EXACT, reponame);
 		it_remote = pkgdb_repo_query(db, is_origin ? origin : name, MATCH_EXACT, reponame);
 		if (it_remote == NULL) {
 			retcode = EX_IOERR;
 			goto cleanup;