87440fe Add error message in case we can't choose a format — HardenedBSD-pkg

HardenedBSD Package Manager

Add error message in case we can't choose a format

Baptiste Daroussin committed 15 years ago

commit 87440fe899c485eaeee96fbd160b45bfe56ab321
parent 5324e147818c71ad2c7e656f714ef582efc898d5

2 files changed +5 -3

modified libpkg/pkg.h

@@ -138,6 +138,10 @@ typedef enum {

 	 * Can not install the package because some dependencies are unresolved.
 	 */
 	EPKG_DEPENDENCY,
 	/**
 	 * the format requested is not supported
 	 */
 	EPKG_FORMAT,
 	EPKG_NOT_ORIGIN,
 	EPKG_NOT_NAME,
 } pkg_error_t;

modified libpkg/pkg_create.c

@@ -129,7 +129,6 @@ pkg_create_from_dir(struct pkg *pkg, const char *root, struct archive *pkg_archi

 	archive_entry_free(entry);
 	archive_read_finish(ar);
 	return (0);
 }

@@ -159,8 +158,7 @@ pkg_create(const char *mpath, pkg_formats format, const char *outdir, const char

 	if ((ext = pkg_create_set_format(pkg_archive, format)) == NULL) {
 		archive_write_finish(pkg_archive);
 		warnx("Unsupport format");
 		return (-1);
 		return pkg_error_set(EPKG_FORMAT, "Unsupported format");
 	}
 	snprintf(namever, sizeof(namever), "%s-%s", pkg_get(pkg, PKG_NAME), pkg_get(pkg, PKG_VERSION));