Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › bdcfeea
Merge pull request #789 from skinder/master
Vsevolod Stakhov committed 12 years ago
commit bdcfeea56c9512871209d738bc63e383483ec5fc
parent 7fdc14b
3 files changed +4 -4
modified libpkg/fetch.c
@@ -312,7 +312,7 @@ start_ssh(struct pkg_repo *repo, struct url *u, off_t *sz)
			if (ssh_args != NULL)

				sbuf_printf(cmd, "%s ", ssh_args);

			if (u->port > 0)
- 
				sbuf_printf(cmd, "-P %d ", u->port);
+ 
				sbuf_printf(cmd, "-p %d ", u->port);

			if (u->user[0] != '\0')

				sbuf_printf(cmd, "%s@", u->user);

			sbuf_cat(cmd, u->host);
modified libpkg/pkg_add.c
@@ -220,7 +220,7 @@ pkg_add(struct pkgdb *db, const char *path, unsigned flags,


	ret = pkg_try_installed(db, origin, &pkg_inst, PKG_LOAD_BASIC);

	if (ret == EPKG_OK) {
- 
		if ((flags & PKG_FLAG_FORCE) == 0) {
+ 
		if ((flags & PKG_ADD_FORCE) == 0) {

			pkg_emit_already_installed(pkg_inst);

			retcode = EPKG_INSTALLED;

			pkg_free(pkg_inst);
@@ -296,7 +296,7 @@ pkg_add(struct pkgdb *db, const char *path, unsigned flags,


	/* register the package before installing it in case there are

	 * problems that could be caught here. */
- 
	retcode = pkgdb_register_pkg(db, pkg, flags & PKG_ADD_UPGRADE, flags & PKG_FLAG_FORCE);
+ 
	retcode = pkgdb_register_pkg(db, pkg, flags & PKG_ADD_UPGRADE, flags & PKG_ADD_FORCE);



	if (retcode != EPKG_OK)

		goto cleanup;
modified src/add.c
@@ -95,7 +95,7 @@ exec_add(int argc, char **argv)
			f |= PKG_ADD_AUTOMATIC;

			break;

		case 'f':
- 
			f |= PKG_FLAG_FORCE;
+ 
			f |= PKG_ADD_FORCE;

			break;

		case 'M':

			f |= PKG_ADD_FORCE_MISSING;