Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › ca94325
Sort the events by name.
Will Andrews committed 14 years ago
commit ca9432593f4a1bc2ae6dd8a819b9d2ea84440fca
parent ecd5b70
1 file changed +47 -46
modified libpkg/pkg_event.c
@@ -9,28 +9,28 @@ pkg_event_argument_check(pkg_event_t ev, int argc)
{



	switch(ev) {
- 
	case PKG_EVENT_INSTALL_BEGIN:
- 
	case PKG_EVENT_FETCH_FAILED:
- 
	case PKG_EVENT_MALLOC_FAILED:
- 
	case PKG_EVENT_UNKNOWN_SCRIPT:

	case PKG_EVENT_ALREADY_INSTALLED:
+ 
	case PKG_EVENT_CKSUM_FAILED:

	case PKG_EVENT_CONFIG_KEY_NOTFOUND:
- 
	case PKG_EVENT_SQLITE_ERROR:

	case PKG_EVENT_DELETE_DEP_EXISTS:
- 
	case PKG_EVENT_CKSUM_FAILED:
+ 
	case PKG_EVENT_FETCH_FAILED:
+ 
	case PKG_EVENT_INSTALL_BEGIN:

	case PKG_EVENT_INVALID_DB_STATE:
+ 
	case PKG_EVENT_MALLOC_FAILED:
+ 
	case PKG_EVENT_UNKNOWN_SCRIPT:

	case PKG_EVENT_SQLITE_CONSTRAINT:
+ 
	case PKG_EVENT_SQLITE_ERROR:

		assert(argc == 1);

		break;
+ 
	case PKG_EVENT_ARCHIVE_COMP_UNSUP:

	case PKG_EVENT_ARCHIVE_ERROR:
+ 
	case PKG_EVENT_CREATEDB_FAILED:

	case PKG_EVENT_ERROR_INSTALLING_DEP:

	case PKG_EVENT_MISSING_DEP:
- 
	case PKG_EVENT_CREATEDB_FAILED:

	case PKG_EVENT_OPEN_DB_FAILED:
+ 
	case PKG_EVENT_PARSE_ERROR:

	case PKG_EVENT_REPO_KEY_UNAVAIL:

	case PKG_EVENT_REPO_KEY_UNUSABLE:
- 
	case PKG_EVENT_PARSE_ERROR:
- 
	case PKG_EVENT_ARCHIVE_COMP_UNSUP:

		assert(argc == 2);

		break;

	case PKG_EVENT_CREATEDB_FAILED_ERRNO:
@@ -49,74 +49,75 @@ static void
libpkg_handle_event(pkg_event_t ev, void **argv)

{

	switch(ev) {
+ 
	case PKG_EVENT_ALREADY_INSTALLED:
+ 
		pkg_error_set(EPKG_INSTALLED, "package '%s' already installed",
+ 
		    pkg_get(argv[0], PKG_NAME));
+ 
		break;
+ 
	case PKG_EVENT_ARCHIVE_COMP_UNSUP:
+ 
		break;

	case PKG_EVENT_ARCHIVE_ERROR:

		pkg_error_set(EPKG_FATAL, "archive error at %s: %s",

		    argv[0], archive_error_string(argv[1]));

		break;
- 
	case PKG_EVENT_IO_ERROR:
- 
		pkg_error_set(EPKG_FATAL, "I/O error: %s(%s): %s",
- 
		    /*call*/argv[0], /*arg*/argv[1], /*strerror*/argv[2]);
+ 
	case PKG_EVENT_CKSUM_FAILED:
+ 
		pkg_error_set(EPKG_FATAL, "package '%s' failed checksum",
+ 
		    pkg_get(argv[0], PKG_NAME));

		break;
- 
	case PKG_EVENT_FETCH_FAILED:
- 
		pkg_error_set(EPKG_FATAL, "%s", argv[0]);
+ 
	case PKG_EVENT_CONFIG_KEY_NOTFOUND:
+ 
		pkg_error_set(EPKG_FATAL, "unknown configuration key `%s'", argv[0]);

		break;
- 
	case PKG_EVENT_MALLOC_FAILED:
- 
		pkg_error_set(EPKG_FATAL, "allocation error: %s", argv[0]);
+ 
	case PKG_EVENT_CREATEDB_FAILED:
+ 
		pkg_error_set(EPKG_FATAL, "%s: %s", argv[0], argv[1]);

		break;
- 
	case PKG_EVENT_UNKNOWN_SCRIPT:
- 
		pkg_error_set(EPKG_FATAL, "unknown script '%s'", argv[0]);
+ 
	case PKG_EVENT_CREATEDB_FAILED_ERRNO:
+ 
		pkg_error_set(EPKG_FATAL, "%s(%s): %s", argv[0], argv[1], argv[2]);

		break;
- 
	case PKG_EVENT_ALREADY_INSTALLED:
- 
		pkg_error_set(EPKG_INSTALLED, "package '%s' already installed",
- 
		    pkg_get(argv[0], PKG_NAME));
+ 
	case PKG_EVENT_DELETE_DEP_EXISTS:
+ 
		pkg_error_set(EPKG_REQUIRED, "%s", argv[0]);

		break;

	case PKG_EVENT_ERROR_INSTALLING_DEP:

		pkg_error_set(EPKG_FATAL, "error while installing dependency %s: %s",

		    argv[0], argv[1]);

		break;
- 
	case PKG_EVENT_MISSING_DEP:
- 
		pkg_error_set(EPKG_DEPENDENCY, "missing %s-%s dependency",
- 
		    argv[0], argv[1]);
+ 
	case PKG_EVENT_FETCH_FAILED:
+ 
		pkg_error_set(EPKG_FATAL, "%s", argv[0]);

		break;
- 
	case PKG_EVENT_CONFIG_KEY_NOTFOUND:
- 
		pkg_error_set(EPKG_FATAL, "unknown configuration key `%s'", argv[0]);
+ 
	case PKG_EVENT_INVALID_DB_STATE:
+ 
		pkg_error_set(EPKG_FATAL, "%s", argv[0]);

		break;
- 
	case PKG_EVENT_CREATEDB_FAILED:
- 
		pkg_error_set(EPKG_FATAL, "%s: %s", argv[0], argv[1]);
+ 
	case PKG_EVENT_IO_ERROR:
+ 
		pkg_error_set(EPKG_FATAL, "I/O error: %s(%s): %s",
+ 
		    /*call*/argv[0], /*arg*/argv[1], /*strerror*/argv[2]);

		break;
- 
	case PKG_EVENT_CREATEDB_FAILED_ERRNO:
- 
		pkg_error_set(EPKG_FATAL, "%s(%s): %s", argv[0], argv[1], argv[2]);
+ 
	case PKG_EVENT_MALLOC_FAILED:
+ 
		pkg_error_set(EPKG_FATAL, "allocation error: %s", argv[0]);

		break;
- 
	case PKG_EVENT_SQLITE_ERROR:
- 
		pkg_error_set(EPKG_FATAL, "sqlite: %s", argv[0]);
+ 
	case PKG_EVENT_MISSING_DEP:
+ 
		pkg_error_set(EPKG_DEPENDENCY, "missing %s-%s dependency",
+ 
		    argv[0], argv[1]);

		break;

	case PKG_EVENT_OPEN_DB_FAILED:

		pkg_error_set(EPKG_FATAL, "db open(%s) failed: %s", argv[0], argv[1]);

		break;
+ 
	case PKG_EVENT_PARSE_ERROR:
+ 
		pkg_error_set(EPKG_FATAL, "parse error(%s): %s", argv[0], argv[1]);
+ 
		break;

	case PKG_EVENT_REPO_KEY_UNAVAIL:

		pkg_error_set(EPKG_FATAL, "RSA key %s invalid: %s", argv[0], argv[1]);

		break;

	case PKG_EVENT_REPO_KEY_UNUSABLE:

		pkg_error_set(EPKG_FATAL, "RSA key %s unusable: %s", argv[0], argv[1]);

		break;
- 
	case PKG_EVENT_DELETE_DEP_EXISTS:
- 
		pkg_error_set(EPKG_REQUIRED, "%s", argv[0]);
- 
		break;
- 
	case PKG_EVENT_PARSE_ERROR:
- 
		pkg_error_set(EPKG_FATAL, "parse error(%s): %s", argv[0], argv[1]);
- 
		break;
- 
	case PKG_EVENT_CKSUM_FAILED:
- 
		pkg_error_set(EPKG_FATAL, "package '%s' failed checksum",
- 
		    pkg_get(argv[0], PKG_NAME));
- 
		break;
- 
	case PKG_EVENT_INVALID_DB_STATE:
- 
		pkg_error_set(EPKG_FATAL, "%s", argv[0]);
- 
		break;

	case PKG_EVENT_SQLITE_CONSTRAINT:

		/* XXX: this is not specific enough - see original usage */

		pkg_error_set(EPKG_FATAL, "constraint violation: %s", argv[0]);

		break;
- 
	case PKG_EVENT_ARCHIVE_COMP_UNSUP:
+ 
	case PKG_EVENT_SQLITE_ERROR:
+ 
		pkg_error_set(EPKG_FATAL, "sqlite: %s", argv[0]);
+ 
		break;
+ 
	case PKG_EVENT_UNKNOWN_SCRIPT:
+ 
		pkg_error_set(EPKG_FATAL, "unknown script '%s'", argv[0]);
+ 
		break;

	default:

		break;

	}