Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 3027cac
Store archive names in meta.
Vsevolod Stakhov committed 11 years ago
commit 3027cac61f3b3e882378568951690fa5e9d894d8
parent 9e93498
2 files changed +24 -0
modified libpkg/pkg_repo_meta.c
@@ -40,10 +40,14 @@ pkg_repo_meta_set_default(struct pkg_repo_meta *meta)


	/* Not use conflicts for now */

	meta->conflicts = NULL;
+ 
	meta->conflicts_archive = NULL;

	meta->manifests = strdup("packagesite.yaml");
+ 
	meta->manifests_archive = strdup("packagesite");

	meta->digests = strdup("digests");
+ 
	meta->digests_archive = strdup("digests");

	/* Not using fulldb */

	meta->fulldb = NULL;
+ 
	meta->fulldb_archive = NULL;

	meta->version = 1;

}
@@ -60,6 +64,10 @@ pkg_repo_meta_free(struct pkg_repo_meta *meta)
		free(meta->manifests);

		free(meta->digests);

		free(meta->fulldb);
+ 
		free(meta->conflicts_archive);
+ 
		free(meta->manifests_archive);
+ 
		free(meta->digests_archive);
+ 
		free(meta->fulldb_archive);

		free(meta->maintainer);

		free(meta->source);

		free(meta->source_identifier);
@@ -91,6 +99,10 @@ pkg_repo_meta_open_schema_v1()
			"manifests = {type = string};\n"

			"conflicts = {type = string};\n"

			"fulldb = {type = string};\n"
+ 
			"digests_archive = {type = string};\n"
+ 
			"manifests_archive = {type = string};\n"
+ 
			"conflicts_archive = {type = string};\n"
+ 
			"fulldb_archive = {type = string};\n"

			"source_identifier = {type = string};\n"

			"revision = {type = integer};\n"

			"eol = {type = integer};\n"
@@ -180,6 +192,10 @@ pkg_repo_meta_parse(ucl_object_t *top, struct pkg_repo_meta **target, int versio
	META_EXTRACT_STRING(digests);

	META_EXTRACT_STRING(manifests);

	META_EXTRACT_STRING(fulldb);
+ 
	META_EXTRACT_STRING(conflicts_archive);
+ 
	META_EXTRACT_STRING(digests_archive);
+ 
	META_EXTRACT_STRING(manifests_archive);
+ 
	META_EXTRACT_STRING(fulldb_archive);



	META_EXTRACT_STRING(source_identifier);
@@ -324,6 +340,10 @@ pkg_repo_meta_to_ucl(struct pkg_repo_meta *meta)
	META_EXPORT_FIELD(result, meta, manifests, string);

	META_EXPORT_FIELD(result, meta, conflicts, string);

	META_EXPORT_FIELD(result, meta, fulldb, string);
+ 
	META_EXPORT_FIELD(result, meta, digests_archive, string);
+ 
	META_EXPORT_FIELD(result, meta, manifests_archive, string);
+ 
	META_EXPORT_FIELD(result, meta, conflicts_archive, string);
+ 
	META_EXPORT_FIELD(result, meta, fulldb_archive, string);



	META_EXPORT_FIELD(result, meta, source_identifier, string);

	META_EXPORT_FIELD(result, meta, revision, int);
modified libpkg/private/pkg.h
@@ -312,9 +312,13 @@ struct pkg_repo_meta {
	pkg_checksum_type_t digest_format;



	char *digests;
+ 
	char *digests_archive;

	char *manifests;
+ 
	char *manifests_archive;

	char *conflicts;
+ 
	char *conflicts_archive;

	char *fulldb;
+ 
	char *fulldb_archive;



	char *source_identifier;

	int64_t revision;