Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 61f1d7c
Fix print the message for pkg install
Baptiste Daroussin committed 11 years ago
commit 61f1d7c2f2090ed5d2d40b84dc9908430d16f6a5
parent f3211f9
2 files changed +17 -12
modified libpkg/pkg_add.c
@@ -464,6 +464,12 @@ pkg_add_common(struct pkgdb *db, const char *path, unsigned flags,
	}

	if ((flags & PKG_ADD_UPGRADE) == 0)

		pkg_emit_install_begin(pkg);
+ 
	else {
+ 
		if (local != NULL)
+ 
			pkg_emit_upgrade_begin(pkg, local);
+ 
		else
+ 
			pkg_emit_install_begin(pkg);
+ 
	}



	if (pkg_is_valid(pkg) != EPKG_OK) {

		pkg_emit_error("the package is not valid");
@@ -564,8 +570,16 @@ pkg_add_common(struct pkgdb *db, const char *path, unsigned flags,
	if ((flags & PKG_ADD_UPGRADE) == 0)

		pkgdb_register_finale(db, retcode);
- 
	if (retcode == EPKG_OK && (flags & PKG_ADD_UPGRADE) == 0)
- 
		pkg_emit_install_finished(pkg);
+ 
	if (retcode == EPKG_OK) {
+ 
		if ((flags & PKG_ADD_UPGRADE) == 0)
+ 
			pkg_emit_install_finished(pkg);
+ 
		else {
+ 
			if (local != NULL)
+ 
				pkg_emit_upgrade_finished(pkg, local);
+ 
			else
+ 
				pkg_emit_install_finished(pkg);
+ 
		}
+ 
	}



	cleanup:

	if (a != NULL) {
modified libpkg/pkg_jobs.c
@@ -1786,12 +1786,8 @@ pkg_jobs_handle_install(struct pkg_solved *ps, struct pkg_jobs *j, bool handle_r
		target = path;

	}
- 
	if (old != NULL) {
+ 
	if (old != NULL)

		new->old_version = strdup(old->version);
- 
		pkg_emit_upgrade_begin(new, old);
- 
	} else {
- 
		pkg_emit_install_begin(new);
- 
	}



	if ((j->flags & PKG_FLAG_FORCE) == PKG_FLAG_FORCE)

		flags |= PKG_ADD_FORCE;
@@ -1821,11 +1817,6 @@ pkg_jobs_handle_install(struct pkg_solved *ps, struct pkg_jobs *j, bool handle_r
		return (retcode);

	}
- 
	if (old != NULL)
- 
		pkg_emit_upgrade_finished(new, old);
- 
	else
- 
		pkg_emit_install_finished(new);
- 


	return (EPKG_OK);

}